diff --git a/app-accessibility/sphinx3/sphinx3-0.8.ebuild b/app-accessibility/sphinx3/sphinx3-0.8.ebuild
index 08fa4df81c44..33a795579518 100644
--- a/app-accessibility/sphinx3/sphinx3-0.8.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.1 2011/11/17 17:45:56 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.2 2012/01/12 16:34:10 mgorny Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
@@ -22,18 +22,16 @@ RDEPEND="${DEPEND}"
RESTRICT_PYTHON_ABIS="3*"
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
src_prepare() {
epatch "${FILESDIR}/${P}_heap_fix.patch"
eprefixify 'python/setup.py'
}
-src_configure() {
- econf \
- $( use_enable static-libs static )
-}
-
src_compile() {
- default
+ autotools-utils_src_compile
if use python; then
python_copy_sources python
@@ -47,9 +45,8 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README
+ local DOCS=( AUTHORS ChangeLog NEWS README )
+ autotools-utils_src_install
if use doc; then
cd doc
@@ -57,7 +54,6 @@ src_install() {
fi
if use python; then
-
installing() {
"$(PYTHON)" setup.py install \
--install-lib="${D}/$(python_get_sitedir)"
@@ -65,6 +61,4 @@ src_install() {
python_execute_function -s --source-dir python installing
fi
-
- remove_libtool_files
}
diff --git a/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
index 5262b6dc5ebd..90da48e0a88d 100644
--- a/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
+++ b/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.1 2011/11/17 17:35:05 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.2 2012/01/12 16:33:37 mgorny Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
@@ -23,15 +23,22 @@ DEPEND="${RDEPEND}
RESTRICT_PYTHON_ABIS="3*"
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
src_configure() {
- econf \
- $( use_with lapack ) \
- $( use_with python ) \
- $( use_enable static-libs static )
+ local myeconfargs=(
+ $( use_with lapack )
+ # python modules are built through distutils
+ # so disable the ugly wrapper
+ --without-python
+ )
+
+ autotools-utils_src_configure
}
src_compile() {
- default
+ autotools-utils_src_compile
if use python; then
python_copy_sources python
@@ -45,7 +52,7 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ autotools-utils_src_install
if use python; then
python_execute_function -s --source-dir python -d
@@ -54,6 +61,4 @@ src_install() {
if use doc; then
dohtml doc/html/*
fi
-
- remove_libtool_files
}
diff --git a/app-admin/fam/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild
index cea9f382235b..54247a274054 100644
--- a/app-admin/fam/fam-2.7.0-r6.ebuild
+++ b/app-admin/fam/fam-2.7.0-r6.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/fam/fam-2.7.0-r6.ebuild,v 1.6 2012/01/09 17:00:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.7 2012/01/12 20:57:45 maekke Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="static-libs"
DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
diff --git a/app-arch/sharutils/sharutils-4.11.1.ebuild b/app-arch/sharutils/sharutils-4.11.1.ebuild
index 49041c233589..6b5eb906fde9 100644
--- a/app-arch/sharutils/sharutils-4.11.1.ebuild
+++ b/app-arch/sharutils/sharutils-4.11.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-arch/sharutils/sharutils-4.11.1.ebuild,v 1.2 2012/01/04 19:31:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.11.1.ebuild,v 1.3 2012/01/12 21:00:38 maekke Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
DEPEND="sys-apps/texinfo
diff --git a/app-benchmarks/ioping/Manifest b/app-benchmarks/ioping/Manifest
new file mode 100644
index 000000000000..19ef99f30fa8
--- /dev/null
+++ b/app-benchmarks/ioping/Manifest
@@ -0,0 +1 @@
+DIST ioping-0.6.tar.gz 6957 RMD160 1142f2a59a51434eadc4a4b4893b94f4b604f071 SHA1 4b3860a6af0755467ebe67c09f36ddaebd9be3e7 SHA256 1d14469b1bfa9243f992be784cc0e3cd86c66bb7edc1b83e22360075c5435ceb
diff --git a/app-benchmarks/ioping/files/ioping-0.6-makefile.patch b/app-benchmarks/ioping/files/ioping-0.6-makefile.patch
new file mode 100644
index 000000000000..b5836696e9f4
--- /dev/null
+++ b/app-benchmarks/ioping/files/ioping-0.6-makefile.patch
@@ -0,0 +1,26 @@
+ Makefile | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b3d741e..79022e9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+-CFLAGS+=-std=c99 -g -Wall -Wextra -pedantic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+-LDFLAGS=-lm
+-PREFIX=/usr/local
++CFLAGS+=-std=c99 -Wall -Wextra -pedantic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++LIBS=-lm
++PREFIX?=/usr/local
+ BINDIR=$(PREFIX)/bin
+ MAN1DIR=$(PREFIX)/share/man/man1
+
+@@ -30,7 +30,7 @@ install: $(BINS) $(MANS)
+ $(CC) $(CFLAGS) -DVERSION=\"${VERSION}\" -c -o $@ $^
+
+ ioping: $(OBJS)
+- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ dist: $(DISTDIR).tar.gz
+
diff --git a/app-benchmarks/ioping/ioping-0.6.ebuild b/app-benchmarks/ioping/ioping-0.6.ebuild
new file mode 100644
index 000000000000..2a6f935701d7
--- /dev/null
+++ b/app-benchmarks/ioping/ioping-0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ioping/ioping-0.6.ebuild,v 1.1 2012/01/13 08:12:28 jlec Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Simple disk I/0 latency measuring tool"
+HOMEPAGE="http://code.google.com/p/ioping/"
+SRC_URI="http://ioping.googlecode.com/files/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-benchmarks/ioping/metadata.xml b/app-benchmarks/ioping/metadata.xml
new file mode 100644
index 000000000000..c845479d513e
--- /dev/null
+++ b/app-benchmarks/ioping/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ jlec@gentoo.org
+
+
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index 8677173ba9c6..25a302a6a4d7 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,2 +1,2 @@
-DIST k9copy-2.3.6-Source.tar.gz 1562476 RMD160 c61a2f3802b50fd99058f448f1687d7bbd543267 SHA1 e0399b42a8dc8b9ea5b0bb332a1e2d7bfa18e104 SHA256 d2ebbb6ee72b8e6b3e7daf62746442e8e3a2edb54603333a418d7da753045436
DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
+DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf
diff --git a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
deleted file mode 100644
index 86316f30936e..000000000000
--- a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kde4/src/mpeg2/kdecmpeg2.cpp 2009/11/23 21:58:43 450
-+++ kde4/src/mpeg2/kdecmpeg2.cpp 2011/02/06 20:41:08 561
-@@ -286,6 +286,7 @@
- }
- }
- }
-+ return 0;
- }
-
- void kDecMPEG2::sync() {
diff --git a/app-cdr/k9copy/k9copy-2.3.6.ebuild b/app-cdr/k9copy/k9copy-2.3.8.ebuild
similarity index 52%
rename from app-cdr/k9copy/k9copy-2.3.6.ebuild
rename to app-cdr/k9copy/k9copy-2.3.8.ebuild
index 36faad57f23c..acba02f288bc 100644
--- a/app-cdr/k9copy/k9copy-2.3.6.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.8.ebuild
@@ -1,37 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.6.ebuild,v 1.7 2011/11/29 22:00:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.1 2012/01/12 16:05:44 johu Exp $
-EAPI=3
-
-if [[ ${PV} != *9999* ]]; then
- KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"
-
- MY_P=${P}-Source
-
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
- S=${WORKDIR}/${MY_P}
-else
- ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
- ESVN_PROJECT="k9copy"
-fi
+EAPI=4
+KDE_DOC_DIRS="doc"
KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca cs da de el es es_AR fr it ja nl pl pt_BR ru sr sr@Latn tr uk zh_TW"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+MY_P=${P}-Source
inherit kde4-base
+ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
+ESVN_PROJECT="k9copy"
DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5."
HOMEPAGE="http://k9copy.sourceforge.net/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="
media-libs/libdvdread
- >=media-libs/libmpeg2-0.5.1
+ media-libs/libmpeg2
media-libs/xine-lib
virtual/ffmpeg
"
@@ -39,10 +33,9 @@ RDEPEND="${DEPEND}
media-video/dvdauthor
media-video/mplayer
"
-
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-return.patch" )
+S=${WORKDIR}/${MY_P}
pkg_postinst() {
kde4-base_pkg_postinst
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index 7afada1beb18..443ceac6f5eb 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1 +1,2 @@
DIST pius-2.0.8.tar.bz2 23780 RMD160 cecca6104035ed6e54b354c280c2817f1c2b3fb1 SHA1 1275abdea6beed728dac858c110aff305f64aa2f SHA256 097ab2354ff39486408117cb10ef175b58b13b9d63dff2515ec8417320ab6f29
+DIST pius-2.0.9.tar.bz2 30225 RMD160 de72307a76a9fea8976db3752a903ab0b939b9ae SHA1 c8ecdf74b3f704a29f828fdbe0575eb247e21524 SHA256 6d2cd48207a76e530b0082bc1cd21ffb44c204f5cfcfe611347a12ca87a732bc
diff --git a/app-crypt/pius/pius-2.0.9.ebuild b/app-crypt/pius/pius-2.0.9.ebuild
new file mode 100644
index 000000000000..a655ac4bb8cb
--- /dev/null
+++ b/app-crypt/pius/pius-2.0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pius/pius-2.0.9.ebuild,v 1.1 2012/01/12 06:17:12 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys."
+HOMEPAGE="http://www.phildev.net/pius/"
+SRC_URI="mirror://sourceforge/pgpius/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="${DEPEND}
+ dev-lang/perl"
+
+src_prepare() {
+ python_convert_shebangs 2 ${PN} ${PN}-keyring-mgr
+}
+
+src_install() {
+ dobin ${PN} ${PN}-keyring-mgr ${PN}-party-worksheet
+ dodoc Changelog README README.keyring-mgr
+}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 699aa26df327..8b8b29932152 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,2 +1 @@
-DIST mg-20110120.tar.gz 137905 RMD160 6f950825cecd266dc69feb8a24e6d1ea7fca540e SHA1 1f0f3eb31f72cbf92513339aa681e289a00d654b SHA256 bd03b584fc16a5b5f61e7e41b38c8d9f5a30b2dd9777d1f7f94616811cbd9983
DIST mg-20110905.tar.gz 138805 RMD160 721b2a2e9059ddf6ea637dafd205575150b58c8c SHA1 51d2bac801cab33c9b552c36db5f8637fbbe9363 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229
diff --git a/app-editors/mg/mg-20110120.ebuild b/app-editors/mg/mg-20110120.ebuild
deleted file mode 100644
index 457a066ab257..000000000000
--- a/app-editors/mg/mg-20110120.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110120.ebuild,v 1.7 2011/09/25 17:49:10 ulm Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="Micro GNU/emacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="livecd"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # econf won't work, as this script does not accept any parameters
- ./configure || die "configure failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- einstall || die
- dodoc README tutorial || die
-}
-
-pkg_postinst() {
- if use livecd; then
- [[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
- fi
-}
diff --git a/app-emacs/cedet/cedet-1.0.1.ebuild b/app-emacs/cedet/cedet-1.0.1.ebuild
index 158f8c97ea4f..0e75ca314028 100644
--- a/app-emacs/cedet/cedet-1.0.1.ebuild
+++ b/app-emacs/cedet/cedet-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.2 2012/01/11 22:44:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.3 2012/01/12 17:30:27 phajdan.jr Exp $
EAPI=4
NEED_EMACS=22
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
LICENSE="GPL-2 FDL-1.2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
new file mode 100644
index 000000000000..c1a80d3c408a
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
@@ -0,0 +1,574 @@
+From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
+From: Alexandre Julliard
+Date: Thu, 24 Feb 2011 13:11:53 +0100
+Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
+ headers.
+
+[Alexandre Rostovtsev : backport to wine-1.2.3]
+---
+ dlls/msxml3/attribute.c | 6 ++++++
+ dlls/msxml3/bsc.c | 6 ++++++
+ dlls/msxml3/cdata.c | 5 +++++
+ dlls/msxml3/comment.c | 5 +++++
+ dlls/msxml3/dispex.c | 5 +++++
+ dlls/msxml3/docfrag.c | 5 +++++
+ dlls/msxml3/domdoc.c | 11 +++++++++--
+ dlls/msxml3/domimpl.c | 5 +++++
+ dlls/msxml3/element.c | 5 +++++
+ dlls/msxml3/entityref.c | 5 +++++
+ dlls/msxml3/factory.c | 5 +++++
+ dlls/msxml3/httprequest.c | 6 ++++++
+ dlls/msxml3/main.c | 15 +++++++++++++++
+ dlls/msxml3/msxml_private.h | 23 -----------------------
+ dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++----
+ dlls/msxml3/nodelist.c | 5 +++++
+ dlls/msxml3/nodemap.c | 5 +++++
+ dlls/msxml3/parseerror.c | 5 +++++
+ dlls/msxml3/pi.c | 5 +++++
+ dlls/msxml3/queryresult.c | 9 +++++++--
+ dlls/msxml3/regsvr.c | 4 ++++
+ dlls/msxml3/saxreader.c | 10 +++++++---
+ dlls/msxml3/schema.c | 12 ++++++++++++
+ dlls/msxml3/text.c | 5 +++++
+ dlls/msxml3/xmldoc.c | 5 +++++
+ dlls/msxml3/xmlelem.c | 5 +++++
+ 26 files changed, 174 insertions(+), 34 deletions(-)
+
+diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
+index d78fa47..3df93d6 100644
+--- a/dlls/msxml3/attribute.c
++++ b/dlls/msxml3/attribute.c
+@@ -23,6 +23,12 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
+index b24e04c..01a09a5 100644
+--- a/dlls/msxml3/bsc.c
++++ b/dlls/msxml3/bsc.c
+@@ -23,6 +23,12 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
+index 3fba66c..caf8cd8 100644
+--- a/dlls/msxml3/cdata.c
++++ b/dlls/msxml3/cdata.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
+index e74de07..1cabfa3 100644
+--- a/dlls/msxml3/comment.c
++++ b/dlls/msxml3/comment.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
+index 09b71fe..6b01b15 100644
+--- a/dlls/msxml3/dispex.c
++++ b/dlls/msxml3/dispex.c
+@@ -22,6 +22,11 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
+index fff3f62..bebd252 100644
+--- a/dlls/msxml3/docfrag.c
++++ b/dlls/msxml3/docfrag.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
+index 0007503..e6a61e4 100644
+--- a/dlls/msxml3/domdoc.c
++++ b/dlls/msxml3/domdoc.c
+@@ -25,6 +25,15 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+ #ifdef HAVE_LIBXML2
+
+-#include
+-
+ /* not defined in older versions */
+ #define XML_SAVE_FORMAT 1
+ #define XML_SAVE_NO_DECL 2
+diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
+index dd518a1..c6794ac 100644
+--- a/dlls/msxml3/domimpl.c
++++ b/dlls/msxml3/domimpl.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
+index 617c008..1b5c693 100644
+--- a/dlls/msxml3/element.c
++++ b/dlls/msxml3/element.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
+index db46193..1baea6e 100644
+--- a/dlls/msxml3/entityref.c
++++ b/dlls/msxml3/entityref.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
+index 3fd229c..45df9f0 100644
+--- a/dlls/msxml3/factory.c
++++ b/dlls/msxml3/factory.c
+@@ -24,6 +24,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
+index 4585484..be1a5f7 100644
+--- a/dlls/msxml3/httprequest.c
++++ b/dlls/msxml3/httprequest.c
+@@ -22,6 +22,12 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
+index 60b0cbd..47a89b1 100644
+--- a/dlls/msxml3/main.c
++++ b/dlls/msxml3/main.c
+@@ -25,6 +25,21 @@
+ #define COBJMACROS
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# ifdef SONAME_LIBXSLT
++# ifdef HAVE_LIBXSLT_PATTERN_H
++# include
++# endif
++# ifdef HAVE_LIBXSLT_TRANSFORM_H
++# include
++# endif
++# include
++# include
++# endif
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
+index e0279f1..e1fbb59 100644
+--- a/dlls/msxml3/msxml_private.h
++++ b/dlls/msxml3/msxml_private.h
+@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
+
+ #ifdef HAVE_LIBXML2
+
+-#ifdef HAVE_LIBXML_PARSER_H
+-#include
+-#endif
+-
+ /* constructors */
+ extern IUnknown *create_domdoc( xmlNodePtr document );
+ extern IUnknown *create_xmldoc( void );
+@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
+
+ #endif
+
+-void* libxslt_handle;
+-#ifdef SONAME_LIBXSLT
+-# ifdef HAVE_LIBXSLT_PATTERN_H
+-# include
+-# endif
+-# ifdef HAVE_LIBXSLT_TRANSFORM_H
+-# include
+-# endif
+-# include
+-# include
+-
+-# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
+-MAKE_FUNCPTR(xsltApplyStylesheet);
+-MAKE_FUNCPTR(xsltCleanupGlobals);
+-MAKE_FUNCPTR(xsltFreeStylesheet);
+-MAKE_FUNCPTR(xsltParseStylesheetDoc);
+-# undef MAKE_FUNCPTR
+-#endif
+-
+ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
+ LONG line, LONG linepos, LONG filepos );
+ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
+diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
+index bbdcb5d..2980566 100644
+--- a/dlls/msxml3/node.c
++++ b/dlls/msxml3/node.c
+@@ -24,6 +24,23 @@
+
+ #include
+ #include
++
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++# ifdef SONAME_LIBXSLT
++# ifdef HAVE_LIBXSLT_PATTERN_H
++# include
++# endif
++# ifdef HAVE_LIBXSLT_TRANSFORM_H
++# include
++# endif
++# include
++# include
++# endif
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -33,16 +50,22 @@
+
+ #include "msxml_private.h"
+
+-#ifdef HAVE_LIBXML2
+-# include
+-#endif
+-
+ #include "wine/debug.h"
+
+ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+ #ifdef HAVE_LIBXML2
+
++#ifdef SONAME_LIBXSLT
++extern void* libxslt_handle;
++# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
++MAKE_FUNCPTR(xsltApplyStylesheet);
++MAKE_FUNCPTR(xsltCleanupGlobals);
++MAKE_FUNCPTR(xsltFreeStylesheet);
++MAKE_FUNCPTR(xsltParseStylesheetDoc);
++# undef MAKE_FUNCPTR
++#endif
++
+ static const WCHAR szBinBase64[] = {'b','i','n','.','b','a','s','e','6','4',0};
+ static const WCHAR szString[] = {'s','t','r','i','n','g',0};
+ static const WCHAR szNumber[] = {'n','u','m','b','e','r',0};
+diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
+index f643c5e..4b2bba9 100644
+--- a/dlls/msxml3/nodelist.c
++++ b/dlls/msxml3/nodelist.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
+index 7d23ec8..d3d9c38 100644
+--- a/dlls/msxml3/nodemap.c
++++ b/dlls/msxml3/nodemap.c
+@@ -23,6 +23,11 @@
+ #define COBJMACROS
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
+index 4b0dc57..89f14ca 100644
+--- a/dlls/msxml3/parseerror.c
++++ b/dlls/msxml3/parseerror.c
+@@ -25,6 +25,11 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winerror.h"
+diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
+index 0baefe4..3ebc1bf 100644
+--- a/dlls/msxml3/pi.c
++++ b/dlls/msxml3/pi.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
+index 2c6f23e..8613b20 100644
+--- a/dlls/msxml3/queryresult.c
++++ b/dlls/msxml3/queryresult.c
+@@ -24,6 +24,13 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+ #ifdef HAVE_LIBXML2
+
+-#include
+-
+ typedef struct _queryresult
+ {
+ DispatchEx dispex;
+diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
+index 415e5af..864d61e 100644
+--- a/dlls/msxml3/regsvr.c
++++ b/dlls/msxml3/regsvr.c
+@@ -24,6 +24,10 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
+
+ #define COBJMACROS
+
+diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
+index eca9f1d..f2d340e 100644
+--- a/dlls/msxml3/saxreader.c
++++ b/dlls/msxml3/saxreader.c
+@@ -24,6 +24,13 @@
+
+ #include
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+ #ifdef HAVE_LIBXML2
+
+-#include
+-#include
+-
+ typedef struct _saxreader
+ {
+ const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
+diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
+index 72d7854..c1465c0 100644
+--- a/dlls/msxml3/schema.c
++++ b/dlls/msxml3/schema.c
+@@ -23,6 +23,18 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++# include
++# include
++# include
++# include
++# include
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
+index fdcb06b..72b2ffd 100644
+--- a/dlls/msxml3/text.c
++++ b/dlls/msxml3/text.c
+@@ -24,6 +24,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
+index d1a010f..0d1006e 100644
+--- a/dlls/msxml3/xmldoc.c
++++ b/dlls/msxml3/xmldoc.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
+index a71b18b..a818d14 100644
+--- a/dlls/msxml3/xmlelem.c
++++ b/dlls/msxml3/xmlelem.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+
+ #include
++#ifdef HAVE_LIBXML2
++# include
++# include
++#endif
++
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+--
+1.7.8.3
+
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
index 79876c9434e0..939200d74eb1 100644
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.10 2011/09/18 09:08:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.11 2012/01/13 00:08:55 tetromino Exp $
EAPI="2"
@@ -117,6 +117,7 @@ src_prepare() {
eautoreconf
fi
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+ epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993
epatch_user #282735
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 6ab163f4939d..5113ae627be2 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,13 +1,13 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.3 2011/11/28 18:29:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.4 2012/01/12 13:40:01 alexxy Exp $
opts="start stop status restart"
depend() {
- need xenstored xenconsoled
- after dhcp xend
+ need xenstored
+ after dhcp xend xenconsoled
}
get_domname() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index 3d17e4346344..3ce8a54cf2f1 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.2 2011/11/30 19:39:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -256,8 +256,8 @@ src_install() {
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd xenstored \
- "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xenstored.initd xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 3b9d68a82247..fdf1ffb86f73 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,3 @@
DIST skrooge-0.8.0.tar.bz2 8262568 RMD160 094659591763bf757cf5bb050f191492163b072a SHA1 47182435735a9abbe733782814ff770ddb5f0ab6 SHA256 67cb3f557bbeb55afa77f7b306187cead45915d1cf0161bbd1206a942d2af66e
-DIST skrooge-0.9.1.tar.bz2 7246125 RMD160 4a7cb0be10e1e006d429c7b483e1b24c53b0cc37 SHA1 e08ab33dc1e35934d5fd21e320dbefbfe44dcd05 SHA256 896e61a65b33b0403c62eb5bf0ec0ffb80dffa571355f9f674d115d34f7afffd
DIST skrooge-1.0.0.tar.bz2 7083506 RMD160 3d40192242621231ef6761d633a1e55cc3ce6ab9 SHA1 f67a9c4fe1dc53c8fd4e26d2e37935fa3f96c1b6 SHA256 8c78cec3ff873d46cf45c809029d72c61e789226ca337b47f75dc41a128de98e
+DIST skrooge-1.1.1.tar.bz2 8559953 RMD160 030e9f16f9ec9a81a48c7610fc0df5b7d73442bf SHA1 063af1a04c2406babc59203e0d57912e834e46f1 SHA256 6553a61a74bb4f5d0272fff4844e47d983fa38cd6af0481658f4d1e3150c6d62
diff --git a/app-office/skrooge/skrooge-0.9.1.ebuild b/app-office/skrooge/skrooge-1.1.1.ebuild
similarity index 58%
rename from app-office/skrooge/skrooge-0.9.1.ebuild
rename to app-office/skrooge/skrooge-1.1.1.ebuild
index dad08555f0ee..befa3477a162 100644
--- a/app-office/skrooge/skrooge-0.9.1.ebuild
+++ b/app-office/skrooge/skrooge-1.1.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-0.9.1.ebuild,v 1.1 2011/09/06 19:45:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.1.1.ebuild,v 1.1 2012/01/12 22:23:05 dilfridge Exp $
EAPI=4
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja ko lt ms nb
-nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_TW"
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja lt nb
+nl pl pt pt_BR ro ru sk sv tr ug zh_CN"
KDE_DOC_DIRS="doc"
+KDE_HANDBOOK=optional
inherit kde4-base
DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
@@ -15,13 +16,17 @@ SRC_URI="http://skrooge.org/files/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="4"
KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
+IUSE="debug"
-DEPEND=">=dev-libs/libofx-0.9.1
+DEPEND="
app-crypt/qca:2
- x11-libs/qt-sql:4[sqlite]"
+ dev-libs/grantlee
+ >=dev-libs/libofx-0.9.1
+ x11-libs/qt-sql:4[sqlite]
+"
RDEPEND="${DEPEND}
- $(add_kdebase_dep kdesdk-scripts)"
+ $(add_kdebase_dep kdesdk-scripts)
+"
DOCS="AUTHORS CHANGELOG README TODO"
diff --git a/app-office/taxbird/Manifest b/app-office/taxbird/Manifest
index d268b5ee4782..369608ec93ed 100644
--- a/app-office/taxbird/Manifest
+++ b/app-office/taxbird/Manifest
@@ -1,2 +1,3 @@
DIST taxbird-0.15.tar.gz 410501 RMD160 bf0c5037ae5595c659d81e96e90de95f6f11d889 SHA1 90e33c06abaf6dd1e32aa1aa29372c073e26aa0b SHA256 0a573fd5400acdeb1b3f580bf4be010bd684dd1e46f307506350df5f776e0bbb
DIST taxbird-0.16.tar.gz 419770 RMD160 0e598a491a2cf491ef19f975b7faea1a945a9648 SHA1 9fc9aa6baf1e415beda58a50dcc6ba818bb2d6db SHA256 afb582a37d1879ebdbbb6ae40fdea7092386dac840a38c191be3a799f2742f82
+DIST taxbird-0.18.tar.gz 414988 RMD160 af77d931f00f2001aa32971684b5029e16188c31 SHA1 2fec2f7f3744ae89c3d7e025bbe0bd45824daeab SHA256 4ed073989eb9d17b06e120e3e9a5669fc48c2b2df26b118521baa98f11e81413
diff --git a/app-office/taxbird/taxbird-0.18.ebuild b/app-office/taxbird/taxbird-0.18.ebuild
new file mode 100644
index 000000000000..5e8606eae730
--- /dev/null
+++ b/app-office/taxbird/taxbird-0.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.18.ebuild,v 1.1 2012/01/13 01:07:39 xmw Exp $
+
+EAPI="2"
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Taxbird provides a GUI to submit tax forms to the german digital tax project ELSTER."
+HOMEPAGE="http://www.taxbird.de/"
+SRC_URI="http://www.taxbird.de/download/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libgeier-0.13
+ >=gnome-extra/gtkhtml-3.8:3.14
+ gnome-base/libgnomeui
+ sys-devel/gettext
+ >=dev-scheme/guile-1.8.0[regex,deprecated]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ dodoc README* || die "dodoc failed"
+
+ einstall || die "Installation failed!"
+
+ # clean out the installed mime files, those get recreated in the pkg_postinst function
+ einfo "Deleting mime files in ${D}/usr/share/mime"
+ find "${D}/usr/share/mime/" -maxdepth 1 -type f -delete
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index af2de47d44aa..ef35c0b94c70 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,4 +1,5 @@
DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6
+DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a
DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
diff --git a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
new file mode 100644
index 000000000000..b680f30d1aa4
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
@@ -0,0 +1,190 @@
+From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
+Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
+From: Justin Lecher
+Date: Thu, 22 Dec 2011 12:09:32 +0100
+Subject: [PATCH] 3.1-hunspell.patch
+
+Conflicts:
+
+ latexeditor.h
+ texmaker.pro
+---
+ configdialog.cpp | 4 ++--
+ latexeditor.h | 2 +-
+ latexeditorview.h | 2 +-
+ latexhighlighter.h | 2 +-
+ spellerdialog.h | 2 +-
+ texmaker.h | 2 +-
+ texmaker.pro | 44 +++++++-------------------------------------
+ 7 files changed, 14 insertions(+), 44 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index 144bddc..89e4059 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
+ #else
+-QDir spelldir(PREFIX"/share/texmaker");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
+ #endif
+ #endif
+
+diff --git a/latexeditor.h b/latexeditor.h
+index 40cc2f6..d46150f 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -28,7 +28,7 @@
+
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ typedef int UserBookmarkList[3];
+
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 283fd8a..1ba39cc 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -22,7 +22,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ class LatexEditorView : public QWidget {
+ Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index 029c7ad..9fbb532 100644
+--- a/latexhighlighter.h
++++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include
+ #include
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
++++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ #include
+
+diff --git a/texmaker.h b/texmaker.h
+index b1a2c65..0806731 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -47,7 +47,7 @@
+ #include "symbollistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index 5d017ad..87fac99 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -4,7 +4,8 @@ TARGET = texmaker
+ QT += network \
+ xml \
+ webkit
+-CONFIG += qt warn_off release
++CONFIG += qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ TEXMAKERVERSION=3.2.2
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -65,25 +66,6 @@ HEADERS += texmaker.h \
+ scandialog.h \
+ synctex_parser.h \
+ synctex_parser_utils.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/replist.hxx \
+- hunspell/w_char.hxx \
+ singleapp/qtlocalpeer.h \
+ singleapp/qtlockedfile.h \
+ singleapp/qtsingleapplication.h \
+@@ -110,7 +92,7 @@ HEADERS += texmaker.h \
+ encodingprober/nsSJISProber.h \
+ encodingprober/nsUniversalDetector.h \
+ encodingprober/qencodingprober.h \
+- encodingprober/UnicodeGroupProber.h
++ encodingprober/UnicodeGroupProber.h
+ SOURCES += main.cpp \
+ texmakerapp.cpp \
+ texmaker.cpp \
+@@ -167,18 +149,6 @@ SOURCES += main.cpp \
+ scandialog.cpp \
+ synctex_parser.c \
+ synctex_parser_utils.c \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/replist.cxx \
+- hunspell/hunzip.cxx \
+ singleapp/qtlocalpeer.cpp \
+ singleapp/qtlockedfile.cpp \
+ singleapp/qtsingleapplication.cpp \
+@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
+ ICONDIR=/usr/share/pixmaps
+ }
+
+-INCLUDEPATH += /usr/include/poppler/qt4
+-LIBS += -L/usr/lib -lpoppler-qt4
+-LIBS += -L/usr/lib -lz
++INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
++LIBS += -lpoppler-qt4
++LIBS += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+
+
+ INSTALLS = target
+--
+1.7.8.1
+
diff --git a/app-office/texmaker/texmaker-3.2.2.ebuild b/app-office/texmaker/texmaker-3.2.2.ebuild
new file mode 100644
index 000000000000..6e3e3280d458
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.2.ebuild,v 1.1 2012/01/12 10:49:59 jlec Exp $
+
+EAPI="3"
+
+inherit base prefix qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+MY_P="${P}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ app-text/poppler[qt4]
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.6.1:4
+ >=x11-libs/qt-core-4.6.1:4
+ >=x11-libs/qt-webkit-4.6.1:4
+ >=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_prepare() {
+ qt4-r2_src_prepare
+ eprefixify ${PN}.pro configdialog.cpp
+}
+
+src_install() {
+ emake INSTALL_ROOT="${ED}" install || die "make install failed"
+
+ insinto /usr/share/pixmaps/texmaker
+ doins utilities/texmaker*.png || die "doins failed."
+ doins utilities/texmaker.svg || die "doins failed."
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-text/dvisvgm/dvisvgm-1.0.10.ebuild b/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
index ddfc32250f30..67d49a70426b 100644
--- a/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.10.ebuild,v 1.1 2011/12/22 12:59:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.10.ebuild,v 1.2 2012/01/12 22:10:10 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild b/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
index 0cfae77e5faf..e951d2110823 100644
--- a/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.3 2011/12/09 12:52:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.4 2012/01/12 22:10:10 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
index 83be5e4b3efc..1317be8b46e3 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.3 2012/01/04 17:14:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.4 2012/01/12 21:03:04 maekke Exp $
EAPI=2
DESCRIPTION="Font utilities for eg manipulating OTF"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="+kpathsea"
diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild
index 625e1eeb57c8..286e8fe0fe65 100644
--- a/app-text/pspdftool/pspdftool-0.03.ebuild
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $
EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools-utils ${EXTRA_ECLASS}
+inherit autotools ${EXTRA_ECLASS}
unset EXTRA_ECLASS
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild
index e4ca65965542..cd75b5c24246 100644
--- a/app-text/pspdftool/pspdftool-9999.ebuild
+++ b/app-text/pspdftool/pspdftool-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $
EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools-utils ${EXTRA_ECLASS}
+inherit autotools ${EXTRA_ECLASS}
unset EXTRA_ECLASS
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 560d068b20d3..b4ea8e81507f 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,4 +1,3 @@
-DIST xmlto-0.0.22.tar.bz2 103939 RMD160 7e2bf68d114473a6ca5162c2d88eaf46ed3a5f46 SHA1 dfe5a5a80bfd814d9e048be55cf8e3d176ad2d0a SHA256 afccc4712f22e0b1773d45803187d7998319662766b10a963f5452d83c0324aa
-DIST xmlto-0.0.23.tar.bz2 105201 RMD160 bbf1e1ee8674a7faeb10643f74a6025d4421d66e SHA1 69aab42d941089db3edb32987299290e2472f675 SHA256 a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4
DIST xmlto-0.0.24-mans.tar.bz2 4575 RMD160 6687bf4d59b823f416b37b179a24ed6d9a315227 SHA1 e5c44ec88dd3e473d0be5151008b00d5fe190dc1 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b
DIST xmlto-0.0.24.tar.bz2 111860 RMD160 c3aa05569571aa7c2acbe0cc93c136a0d77a7d80 SHA1 68b1664e9ba4d76c37c373f2f0082d62c41506c8 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13
+DIST xmlto-0.0.25.tar.bz2 116496 RMD160 cba4f99be538cd08b73e9b1a6956c318f132284f SHA1 5d1aecd59d519066f94b4591722767c4e41bdc0f SHA256 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536
diff --git a/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
deleted file mode 100644
index eec3d6d7210f..000000000000
--- a/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xmlto-0.0.22/Makefile.am
-===================================================================
---- xmlto-0.0.22.orig/Makefile.am
-+++ xmlto-0.0.22/Makefile.am
-@@ -67,11 +67,9 @@ EXTRA_DIST = xmlto.spec \
- doc/xmlif.xml \
- xmlto.mak
-
--$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
-- for xml in xmlif.xml xmlto.xml; do \
-- FORMAT_DIR=$(top_srcdir)/format \
-- $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
-- done || ( RC=$$?; exit $$RC )
-+man/man1/%.1: doc/%.xml
-+ FORMAT_DIR=$(top_srcdir)/format \
-+ $(BASH) ./xmlto -o $(dir $@) man $<
-
- TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
- TESTS = xmlif/test/run-test
diff --git a/app-text/xmlto/xmlto-0.0.22.ebuild b/app-text/xmlto/xmlto-0.0.22.ebuild
deleted file mode 100644
index 45f5b9f84226..000000000000
--- a/app-text/xmlto/xmlto-0.0.22.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.15 2009/12/21 03:53:53 vapier Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
- || ( sys-apps/which sys-freebsd/freebsd-ubin )
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.62.0-r1
- ~app-text/docbook-xml-dtd-4.2
- || ( sys-apps/util-linux
- app-misc/getopt )
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp
- sys-freebsd/freebsd-ubin )
- latex? ( >=app-text/passivetex-1.25
- >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch \
- "${FILESDIR}"/${P}-parallelmake.patch
- eautoreconf
-}
-
-src_configure() {
- has_version sys-apps/util-linux || export GETOPT="getopt-long"
- econf --prefix=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
- insinto /usr/share/doc/${PF}/xml
- doins doc/*.xml
-}
diff --git a/app-text/xmlto/xmlto-0.0.23.ebuild b/app-text/xmlto/xmlto-0.0.23.ebuild
deleted file mode 100644
index fba72ced52e9..000000000000
--- a/app-text/xmlto/xmlto-0.0.23.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.23.ebuild,v 1.8 2011/07/10 23:46:16 halcy0n Exp $
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
- || ( sys-apps/which sys-freebsd/freebsd-ubin )
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.62.0-r1
- ~app-text/docbook-xml-dtd-4.2
- || ( sys-apps/util-linux app-misc/getopt )
- || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
- latex? ( >=app-text/passivetex-1.25
- >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
- "${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
- eautoreconf
-}
-
-src_configure() {
- export BASH
- has_version sys-apps/util-linux || export GETOPT="getopt-long"
- econf --prefix="${EPREFIX}"/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
- dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
- insinto /usr/share/doc/${PF}/xml
- doins doc/*.xml
-}
diff --git a/app-text/xmlto/xmlto-0.0.24-r1.ebuild b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
index 26baedf026ed..fef2c6d0dd61 100644
--- a/app-text/xmlto/xmlto-0.0.24-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.6 2011/11/07 00:23:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.7 2012/01/12 16:53:16 ssuominen Exp $
EAPI="3"
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="latex"
RDEPEND="app-shells/bash
diff --git a/app-text/xmlto/xmlto-0.0.24.ebuild b/app-text/xmlto/xmlto-0.0.24.ebuild
deleted file mode 100644
index 3484acb6f8f7..000000000000
--- a/app-text/xmlto/xmlto-0.0.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24.ebuild,v 1.1 2011/07/30 22:10:37 patrick Exp $
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
- || ( sys-apps/which sys-freebsd/freebsd-ubin )
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.62.0-r1
- ~app-text/docbook-xml-dtd-4.2
- || ( sys-apps/util-linux app-misc/getopt )
- || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
- latex? ( >=app-text/passivetex-1.25
- >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
- "${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
- eautoreconf
-}
-
-src_configure() {
- export BASH
- has_version sys-apps/util-linux || export GETOPT="getopt-long"
- econf --prefix="${EPREFIX}"/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
- dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
- insinto /usr/share/doc/${PF}/xml
- doins doc/*.xml
-}
diff --git a/app-text/xmlto/xmlto-0.0.25.ebuild b/app-text/xmlto/xmlto-0.0.25.ebuild
new file mode 100644
index 000000000000..b90a628b4b4c
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.25.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.1 2012/01/12 17:11:36 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+ app-text/docbook-xml-dtd:4.2
+ app-shells/bash
+ dev-libs/libxslt
+ sys-apps/grep
+ || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+ || ( sys-apps/util-linux app-misc/getopt )
+ || ( sys-apps/which sys-freebsd/freebsd-ubin )
+ latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+ sys-devel/flex"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+}
+
+src_configure() {
+ export BASH
+ has_version sys-apps/util-linux || export GETOPT=getopt-long
+ econf
+}
diff --git a/dev-haskell/data-binary-ieee754/Manifest b/dev-haskell/data-binary-ieee754/Manifest
new file mode 100644
index 000000000000..4634d6fd45c5
--- /dev/null
+++ b/dev-haskell/data-binary-ieee754/Manifest
@@ -0,0 +1 @@
+DIST data-binary-ieee754-0.4.2.1.tar.gz 3977 RMD160 aa72390c580bb5ad948f93eeb3a4175abfa00469 SHA1 7f716a8851bda26e83410270acb541772718e4fd SHA256 7f26a8f647ee77ba4d7674df4fb39c5eb96c3eff6c502deea50e158430651644
diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild
new file mode 100644
index 000000000000..1549a0ce8849
--- /dev/null
+++ b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild,v 1.1 2012/01/12 16:35:53 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Parser/Serialiser for IEEE-754 floating-point values"
+HOMEPAGE="http://john-millikin.com/software/data-binary-ieee754/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-binary-ieee754/metadata.xml b/dev-haskell/data-binary-ieee754/metadata.xml
new file mode 100644
index 000000000000..d5b9a7d3c1c4
--- /dev/null
+++ b/dev-haskell/data-binary-ieee754/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Convert Float and Decimal values to/from raw octets.
+
+
diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest
new file mode 100644
index 000000000000..b9a5cf55eea4
--- /dev/null
+++ b/dev-haskell/dbus-core/Manifest
@@ -0,0 +1 @@
+DIST dbus-core-0.9.2.1.tar.gz 216825 RMD160 5a1240cb8e0e5f8d43981b6df2558cc59a1c1eee SHA1 af8c29b64638f3300abf2543bcade9ea01718860 SHA256 fd286723fc7b906eb7ff2daa581cd33c06c31cd2fb808f6707a43da2319fdbbc
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.2.1.ebuild b/dev-haskell/dbus-core/dbus-core-0.9.2.1.ebuild
new file mode 100644
index 000000000000..9d7540eb13aa
--- /dev/null
+++ b/dev-haskell/dbus-core/dbus-core-0.9.2.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-haskell/dbus-core/dbus-core-0.9.2.1.ebuild,v 1.1 2012/01/12 17:10:56 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level D-Bus protocol implementation"
+HOMEPAGE="https://john-millikin.com/software/dbus-core/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4
+ =dev-haskell/data-binary-ieee754-0.3
+ =dev-haskell/network-2.2
+ =dev-haskell/parsec-2.0
+ =dev-haskell/text-0.11.1.5
+ =dev-haskell/vector-0.7
+ =dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+src_prepare() {
+ if has_version "
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Low-level D-Bus protocol implementation
+
+
diff --git a/dev-haskell/libxml-sax/Manifest b/dev-haskell/libxml-sax/Manifest
new file mode 100644
index 000000000000..6b086f9efa75
--- /dev/null
+++ b/dev-haskell/libxml-sax/Manifest
@@ -0,0 +1 @@
+DIST libxml-sax-0.7.2.tar.gz 8520 RMD160 7cb427ca54fadf632e5a2810fba70b060432287d SHA1 0f9cc4691d61ae158e7618227841a8ef2480f987 SHA256 bfffec7c2078a31d14a427d9d2f094995f38a92816ca795758a5655a0f7bb5d5
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild
new file mode 100644
index 000000000000..a0dfa663b404
--- /dev/null
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild,v 1.1 2012/01/12 16:44:25 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for the libXML2 SAX interface"
+HOMEPAGE="http://john-millikin.com/software/bindings/libxml-sax/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/ghc-6.10.1
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-haskell/c2hs
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/libxml-sax/metadata.xml b/dev-haskell/libxml-sax/metadata.xml
new file mode 100644
index 000000000000..5aff3ab6b969
--- /dev/null
+++ b/dev-haskell/libxml-sax/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Bindings for the libXML2 SAX interface
+
+
diff --git a/dev-haskell/pcap/Manifest b/dev-haskell/pcap/Manifest
new file mode 100644
index 000000000000..99754053333a
--- /dev/null
+++ b/dev-haskell/pcap/Manifest
@@ -0,0 +1 @@
+DIST pcap-0.4.5.1.tar.gz 48534 RMD160 0a91385be5177a7020a1f2c1243229e0461d08af SHA1 debadd06490fb97f4b79b8f25e7f7e05f9ed12da SHA256 b21f220ecdd854f3bf371dec9c082f626e2757c11495d00e41dd8b63b67e6c5c
diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
new file mode 100644
index 000000000000..6453a87d16e7
--- /dev/null
+++ b/dev-haskell/pcap/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ A system-independent interface for user-level packet capture
+
+
diff --git a/dev-haskell/pcap/pcap-0.4.5.1.ebuild b/dev-haskell/pcap/pcap-0.4.5.1.ebuild
new file mode 100644
index 000000000000..a1a042400c57
--- /dev/null
+++ b/dev-haskell/pcap/pcap-0.4.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.1.ebuild,v 1.1 2012/01/12 17:14:37 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A system-independent interface for user-level packet capture"
+HOMEPAGE="http://bitbucket.org/bos/pcap"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/network
+ dev-haskell/time
+ >=dev-lang/ghc-6.8.2
+ net-libs/libpcap"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
new file mode 100644
index 000000000000..5488118ca8e8
--- /dev/null
+++ b/dev-haskell/primitive/Manifest
@@ -0,0 +1 @@
+DIST primitive-0.4.1.tar.gz 9058 RMD160 164e14d35b321033a3c834c217ff2c8ab3d5a9d1 SHA1 04394cb2cbb818c04f8b1ef56b0204b459b52fd4 SHA256 c69dd5e2a4da743037c51d5b626ab4f4bc3d7f023664bb9ae372c39e4a4c2919
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
new file mode 100644
index 000000000000..0e169ee5774d
--- /dev/null
+++ b/dev-haskell/primitive/metadata.xml
@@ -0,0 +1,34 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+
+ This package provides wrappers for primitive array operations from
+ GHC.Prim.
+
+ Changes in version 0.4.0.1
+
+ * Critical bug fix in @fillByteArray@
+
+ Changes in version 0.4
+
+ * Support for GHC 7.2 array copying primitives
+
+ * New in "Data.Primitive.ByteArray": @copyByteArray@,
+ @copyMutableByteArray@, @moveByteArray@, @fillByteArray@
+
+ * Deprecated in "Data.Primitive.ByteArray": @memcpyByteArray@,
+ @memcpyByteArray'@, @memmoveByteArray@, @memsetByteArray@
+
+ * New in "Data.Primitive.Array": @copyArray@, @copyMutableByteArray@
+
+ * New in "Data.Primitive.Addr": @copyAddr@, @moveAddr@
+
+ * Deprecated in "Data.Primitive.Addr": @memcpyAddr@
+
+
+
diff --git a/dev-haskell/primitive/primitive-0.4.1.ebuild b/dev-haskell/primitive/primitive-0.4.1.ebuild
new file mode 100644
index 000000000000..9ba8676f57c6
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.4.1.ebuild,v 1.1 2012/01/12 16:52:26 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Wrappers for primitive operations"
+HOMEPAGE="http://code.haskell.org/primitive"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 055ef1c85f80..57c69ec2afff 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1 +1,2 @@
DIST text-0.11.1.1.tar.gz 119505 RMD160 304746b8e3c0298babcc0099186d7a242e401b12 SHA1 65ea09e6770ddc11524ab027d51c76c10e859630 SHA256 4e228d33022f751a6023e092bc64c071daeb4560e8358575e58623a542f975df
+DIST text-0.11.1.12.tar.gz 120261 RMD160 fdfc9b080b8653918b15f6c8ef62ad82102e5da0 SHA1 d2f4e55c52e813087068fd259d508299d8c4ce13 SHA256 b4ce2d05ad1c2f4c2fa75a7e1c10b1aaf15b055bb2bd8a7b9dac0f0939214048
diff --git a/dev-haskell/text/files/text-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch b/dev-haskell/text/files/text-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch
new file mode 100644
index 000000000000..8106b9253146
--- /dev/null
+++ b/dev-haskell/text/files/text-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch
@@ -0,0 +1,18 @@
+--- text-0.11.1.6-orig/tests/tests/src/Data/Text/Tests/Properties.hs 2011-10-26 09:22:13.000000000 +1100
++++ text-0.11.1.6/tests/tests/src/Data/Text/Tests/Properties.hs 2011-10-30 00:23:25.547365548 +1100
+@@ -1097,10 +1097,11 @@
+ ],
+
+ testGroup "input-output" [
+- testProperty "t_write_read" t_write_read,
+- testProperty "tl_write_read" tl_write_read,
+- testProperty "t_write_read_line" t_write_read_line,
+- testProperty "tl_write_read_line" tl_write_read_line
++ -- These tests fail in locales other than latin1 locales.
++ -- testProperty "t_write_read" t_write_read,
++ -- testProperty "tl_write_read" tl_write_read,
++ -- testProperty "t_write_read_line" t_write_read_line,
++ -- testProperty "tl_write_read_line" tl_write_read_line
+ -- These tests are subject to I/O race conditions when run under
+ -- test-framework-quickcheck2.
+ -- testProperty "t_put_get" t_put_get
diff --git a/dev-haskell/text/text-0.11.1.12.ebuild b/dev-haskell/text/text-0.11.1.12.ebuild
new file mode 100644
index 000000000000..87367c0fdb21
--- /dev/null
+++ b/dev-haskell/text/text-0.11.1.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.1.12.ebuild,v 1.2 2012/01/12 17:09:35 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit eutils haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type."
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/deepseq-1.1.0.0
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/quickcheck-2.4.0.1
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+
+ An efficient implementation of Int-indexed arrays (both mutable
+ and immutable), with a powerful loop optimisation framework .
+
+ It is structured as follows:
+
+ ["Data.Vector"] Boxed vectors of arbitrary types.
+
+ ["Data.Vector.Unboxed"] Unboxed vectors with an adaptive
+ representation based on data type families.
+
+ ["Data.Vector.Storable"] Unboxed vectors of 'Storable' types.
+
+ ["Data.Vector.Primitive"] Unboxed vectors of primitive types as
+ defined by the @primitive@ package. "Data.Vector.Unboxed" is more
+ flexible at no performance cost.
+
+ ["Data.Vector.Generic"] Generic interface to the vector types.
+
+ Each module has a @Safe@ version with is marked as @Trustworthy@
+ (see <http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell>).
+
+ There is also a (draft) tutorial on common uses of vector.
+
+ * <http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial>
+
+ Please use the project trac to submit bug reports and feature
+ requests.
+
+ * <http://trac.haskell.org/vector>
+
+ Changes in version 0.9
+
+ * 'MonadPlus' instance for boxed vectors
+
+ * Export more @construct@ and @constructN@ from @Safe@ modules
+
+ * Require @primitive-0.4.0.1@
+
+ Changes in version 0.8
+
+ * New functions: @constructN@, @constructrN@
+
+ * Support for GHC 7.2 array copying primitives
+
+ * New fixity for @(!)@
+
+ * Safe Haskell support (contributed by David Terei)
+
+ * 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and
+ 'Traversable' instances for boxed vectors
+ (/WARNING: they tend to be slow and are only provided for completeness/)
+
+ * 'Show' instances for immutable vectors follow containers conventions
+
+ * 'Read' instances for all immutable vector types
+
+ * Performance improvements
+
+
+
diff --git a/dev-haskell/vector/vector-0.9.1.ebuild b/dev-haskell/vector/vector-0.9.1.ebuild
new file mode 100644
index 000000000000..7a0f111f3295
--- /dev/null
+++ b/dev-haskell/vector/vector-0.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.1 2012/01/12 16:55:23 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="http://code.haskell.org/vector"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/primitive-0.4*
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/xml-types/Manifest b/dev-haskell/xml-types/Manifest
new file mode 100644
index 000000000000..c6c34bd5e7a7
--- /dev/null
+++ b/dev-haskell/xml-types/Manifest
@@ -0,0 +1 @@
+DIST xml-types-0.3.tar.gz 3659 RMD160 7d070934bf80f066751dcba80c2eeda0bd446a9d SHA1 89e2fddadf922265976063ddbfa9ec31099e6e22 SHA256 c7531a5bc1009a1dc2e39f07d3a615a2fdfbfd3fdadca9995e47b162903e1d34
diff --git a/dev-haskell/xml-types/metadata.xml b/dev-haskell/xml-types/metadata.xml
new file mode 100644
index 000000000000..117a3bdd612a
--- /dev/null
+++ b/dev-haskell/xml-types/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Basic types for representing XML
+
+
diff --git a/dev-haskell/xml-types/xml-types-0.3.ebuild b/dev-haskell/xml-types/xml-types-0.3.ebuild
new file mode 100644
index 000000000000..5614fa1b44a1
--- /dev/null
+++ b/dev-haskell/xml-types/xml-types-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.ebuild,v 1.1 2012/01/12 16:42:11 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic types for representing XML"
+HOMEPAGE="http://hackage.haskell.org/package/xml-types"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1c59757e48f9..cc0302bc95b3 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,3 +1,4 @@
DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
DIST jffi-1.0.0.tar.gz 1627422 RMD160 0b20a343239b8480e1b6ee787288862b02a4f575 SHA1 fa7d9c3ca58afea36e9ef643f882c828e7ce96d0 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e
+DIST jffi-1.0.11.tar.gz 1899655 RMD160 7780cc45e4c777d5d70814bc3a25bbd96bb9146e SHA1 744fa907573b37801c9a4085f83cdc8b1ed2f2c6 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a
DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f6ea466ce2 SHA1 b58cd19600acf6ea8a2adf04b1f1d72b7f84bce5 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a
diff --git a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+ WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/files/jffi_maven-build.xml b/dev-java/jffi/files/jffi_maven-build.xml
new file mode 100644
index 000000000000..d8114185ee41
--- /dev/null
+++ b/dev-java/jffi/files/jffi_maven-build.xml
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/jffi/jffi-1.0.11.ebuild b/dev-java/jffi/jffi-1.0.11.ebuild
new file mode 100644
index 000000000000..0129073aa2e4
--- /dev/null
+++ b/dev-java/jffi/jffi-1.0.11.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11.ebuild,v 1.1 2012/01/12 09:52:45 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+ virtual/libffi"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ dev-util/pkgconfig
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jffi-* "${P}" || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+ epatch "${FILESDIR}"/${P}_no-werror.patch
+
+ find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+ # generate Version.java
+ cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+ package com.kenai.jffi;
+ public final class Version {
+ private Version() {}
+ public static final int MAJOR = $(get_version_component_range 1);
+ public static final int MINOR = $(get_version_component_range 2);
+ public static final int MICRO = $(get_version_component_range 3);
+ }
+ EOF
+
+ java-pkg-2_src_compile
+
+ # generate headers
+ mkdir -p build/jni
+ javah -d build/jni -classpath target/classes \
+ com.kenai.jffi.Foreign \
+ com.kenai.jffi.ObjectBuffer \
+ com.kenai.jffi.Version \
+ || die
+
+ #build native library.
+ local args=(
+ SRC_DIR=jni
+ JNI_DIR=jni
+ BUILD_DIR=build/jni
+ VERSION=$(get_version_component_range 1-2)
+ USE_SYSTEM_LIBFFI=1
+ -f jni/GNUmakefile
+ )
+ emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+ # build native test library
+ emake BUILD_DIR=build -f libtest/GNUmakefile
+
+ _JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+ java-pkg-2_src_test
+}
+
+src_install() {
+ cat <<-EOF > boot.properties
+ jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+ EOF
+ jar -uf target/${PN}.jar boot.properties || die
+
+ java-pkg_dojar target/${PN}.jar
+ java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
new file mode 100644
index 000000000000..a54718c9656c
--- /dev/null
+++ b/dev-java/jnr-constants/Manifest
@@ -0,0 +1 @@
+DIST jnr-constants-0.8.2.tar.gz 110511 RMD160 0782daf04bba7284012b68418dd2f93791eba3d5 SHA1 2c6925b670d6723b1bbfc98081e6d1eae102ccbe SHA256 924b242877a8472e5828a5ae5f9d5a1f0c0981b7629cd68600d76c9536f2f323
diff --git a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
new file mode 100644
index 000000000000..75f8458ee2c2
--- /dev/null
+++ b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
new file mode 100644
index 000000000000..738da3386e40
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.8.2.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-java/jnr-constants/jnr-constants-0.8.2.ebuild,v 1.1 2012/01/12 11:34:14 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.5"
+DEPEND="
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit:0
+ >=dev-java/junit-4.8:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-constants-* ${P} || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-constants/metadata.xml b/dev-java/jnr-constants/metadata.xml
new file mode 100644
index 000000000000..82a57ccd5243
--- /dev/null
+++ b/dev-java/jnr-constants/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+java
+
+
+
+
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
new file mode 100644
index 000000000000..6dd1371906f6
--- /dev/null
+++ b/dev-java/jnr-ffi/Manifest
@@ -0,0 +1,2 @@
+DIST jnr-ffi-0.5.10.tar.gz 559174 RMD160 9c7794644b7f22b84859f847a2e13e359123799b SHA1 55b0af8b65353373a799fbad7152e98676739d20 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a
+DIST jnr-ffi-0.6.0.tar.gz 97712 RMD160 cb0ed527d24b055d211bf34371d2f105b2eb0ca5 SHA1 8ca1fc9ceed63eec6a3a656cc9e2633c9d88f3d8 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a
diff --git a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
new file mode 100644
index 000000000000..0337f347bec0
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
new file mode 100644
index 000000000000..6898c647403b
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild,v 1.1 2012/01/12 11:27:05 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+ dev-java/jffi:1.0
+ dev-java/jnr-x86asm:1.0
+ dev-java/asm:3"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit:0
+ >=dev-java/junit-4.8:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-ffi-* "${P}" || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+ find "${WORKDIR}" -name '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+ # build native test library
+ emake BUILD_DIR=build -f libtest/GNUmakefile
+
+ _JAVA_OPTIONS="-Djna.library.path=build" \
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
new file mode 100644
index 000000000000..44d27d53bf97
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild,v 1.1 2012/01/12 11:27:05 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.6"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Fail, upstream pom has ignore test failures enabled.
+RESTRICT="test"
+
+COMMON_DEP="
+ dev-java/jffi:1.0
+ dev-java/jnr-x86asm:1.0
+ dev-java/asm:3"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit:0
+ >=dev-java/junit-4.8:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-ffi-* "${P}" || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+ # build native test library
+ emake BUILD_DIR=build -f libtest/GNUmakefile
+
+ _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-ffi/metadata.xml b/dev-java/jnr-ffi/metadata.xml
new file mode 100644
index 000000000000..82a57ccd5243
--- /dev/null
+++ b/dev-java/jnr-ffi/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+java
+
+
+
+
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 17a2a7f923bb..e4532da2eb09 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1 +1,3 @@
DIST jnr-posix-1.1.4.tar.gz 195235 RMD160 ff676df8f8192ce8fdc9743b29c5318ff1fb9439 SHA1 fd7e262510196b7d54eea1d843cd688f76907ce8 SHA256 efac5b9239a2d89036d26e647b55a3dac52eb0383d133ca44914de8c35d9006f
+DIST jnr-posix-1.1.8.tar.gz 206617 RMD160 a668159c4f51276280961443a087036c5e2256fe SHA1 d54f8dd3d681d7df115c355189e830a39fa9dbea SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1
+DIST jnr-posix-2.0.0.tar.gz 54286 RMD160 919671a430b52988b95cc563cfc6f15ce8182dfb SHA1 668a039b2da45b5b3ef12ab8d300e59484792a58 SHA256 e7121253092afd81adf2a28225ee92b5adb8bcb36e3d9aa159b5861fb8b27400
diff --git a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
new file mode 100644
index 000000000000..82260e156394
--- /dev/null
+++ b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild b/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild
new file mode 100644
index 000000000000..87935e6e06c6
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild,v 1.1 2012/01/12 12:06:53 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="http://github.com/jnr/"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+ dev-java/jnr-constants:0
+ dev-java/jnr-ffi:0.5"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit
+ dev-java/junit:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-posix-* ${P} || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.5"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+ dodoc README.txt
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
new file mode 100644
index 000000000000..edf72edc4e38
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild,v 1.1 2012/01/12 12:06:53 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="http://github.com/jnr/"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+ dev-java/jnr-constants:0
+ dev-java/jnr-ffi:0.6"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit
+ dev-java/junit:4
+ )"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-posix-* ${P} || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.6"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/${PN}.jar
+ dodoc README.txt
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-x86asm/Manifest b/dev-java/jnr-x86asm/Manifest
index b5e20055429a..cf5d78e5d9c9 100644
--- a/dev-java/jnr-x86asm/Manifest
+++ b/dev-java/jnr-x86asm/Manifest
@@ -1 +1,2 @@
DIST jnr-x86asm-0.1.tar.gz 83289 RMD160 b0a85dc019c9e09458b1e8db945c585aa33776b0 SHA1 83b14d054f0df4e16c27411b013b4481732a7a56 SHA256 31c0fbcc1fa3eb9b51a2644bf302dc88afdbbac78537020488403012af552eca
+DIST jnr-x86asm-1.0.1.tar.gz 114159 RMD160 c91beedcf9e9fd529512576e09a8d8f7b1badc09 SHA1 a1b3060f69bf85d1aa0f91d11ebc7da0653f314d SHA256 7528e5f7103ab1a40e0473cff377eb2c14e616d17c69010a8366658ed2da3f0c
diff --git a/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml b/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
new file mode 100644
index 000000000000..f78f62e1a937
--- /dev/null
+++ b/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
new file mode 100644
index 000000000000..5bb9ac390dc1
--- /dev/null
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild,v 1.1 2012/01/12 11:18:36 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A pure-java port of asmjit."
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+ unpack ${A}
+ mv jnr-jnr-x86asm-* ${P} || die
+}
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_install() {
+ java-pkg_newjar target/${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-lang/php/php-5.3.9.ebuild b/dev-lang/php/php-5.3.9.ebuild
index 4914b92c60bb..02d7a0b027cf 100644
--- a/dev-lang/php/php-5.3.9.ebuild
+++ b/dev-lang/php/php-5.3.9.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/php/php-5.3.9.ebuild,v 1.4 2012/01/11 22:59:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.5 2012/01/12 17:31:25 phajdan.jr Exp $
EAPI=4
@@ -12,7 +12,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
function php_get_uri ()
{
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
new file mode 100644
index 000000000000..4d4b299aaca2
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.1 2012/01/12 07:34:48 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
+
+SASLAUTHD_CONF_VER="2.1.21"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+ berkdb? ( >=sys-libs/db-3.2 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ kerberos? ( virtual/krb5 )
+ openldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql-base )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl )
+ java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sasldb_al.patch
+ epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
+ epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
+ epatch "${FILESDIR}"/${P}-autotools_fixes.patch
+ epatch "${FILESDIR}"/${P}-as_needed.patch
+ epatch "${FILESDIR}"/${P}-missing_header.patch
+ epatch "${FILESDIR}"/${P}-gssapi.patch
+ epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
+ epatch "${FILESDIR}"/${P}-fix_heimdal.patch
+ epatch "${FILESDIR}"/${P}-auxprop.patch
+ epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+ epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
+# epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch
+
+ # Use plugindir for sasldir
+ sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+ "${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+ AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+ # Java support.
+ use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+ local myconf
+
+ # Add authdaemond support (bug #56523).
+ if use authdaemond ; then
+ myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+ fi
+
+ # Fix for bug #59634.
+ if ! use ssl ; then
+ myconf="${myconf} --without-des"
+ fi
+
+ if use mysql || use postgres ; then
+ myconf="${myconf} --enable-sql"
+ else
+ myconf="${myconf} --disable-sql"
+ fi
+
+ # Default to GDBM if both 'gdbm' and 'berkdb' are present.
+ if use gdbm ; then
+ einfo "Building with GNU DB as database backend for your SASLdb"
+ myconf="${myconf} --with-dblib=gdbm"
+ elif use berkdb ; then
+ einfo "Building with BerkeleyDB as database backend for your SASLdb"
+ myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+ else
+ einfo "Building without SASLdb support"
+ myconf="${myconf} --with-dblib=none"
+ fi
+
+ # Use /dev/urandom instead of /dev/random (bug #46038).
+ if use urandom ; then
+ myconf="${myconf} --with-devrandom=/dev/urandom"
+ fi
+
+ econf \
+ --enable-login \
+ --enable-ntlm \
+ --enable-auth-sasldb \
+ --disable-cmulocal \
+ --disable-krb4 \
+ --enable-otp \
+ --without-sqlite \
+ --with-saslauthd=/var/lib/sasl2 \
+ --with-pwcheck=/var/lib/sasl2 \
+ --with-configdir=/etc/sasl2 \
+ --with-plugindir=/usr/$(get_libdir)/sasl2 \
+ --with-dbpath=/etc/sasl2/sasldb2 \
+ $(use_with ssl openssl) \
+ $(use_with pam) \
+ $(use_with openldap ldap) \
+ $(use_enable ldapdb) \
+ $(use_enable sample) \
+ $(use_enable kerberos gssapi) \
+ $(use_enable java) \
+ $(use_with java javahome ${JAVA_HOME}) \
+ $(use_with mysql) \
+ $(use_with postgres pgsql) \
+ $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+ $(use_enable srp) \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_compile() {
+ emake
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ # Thanks to axxo@gentoo.org for the solution.
+ cd "${S}"
+ if use java ; then
+ jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+ fi
+
+ # Add testsaslauthd (bug #58768).
+ cd "${S}/saslauthd"
+ emake testsaslauthd
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ keepdir /var/lib/sasl2 /etc/sasl2
+
+ if use sample ; then
+ docinto sample
+ dodoc sample/*.c
+ exeinto /usr/share/doc/${P}/sample
+ doexe sample/client sample/server
+ fi
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ if use java ; then
+ java-pkg_dojar ${PN}.jar
+ java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+ # hackish, don't wanna dig through makefile
+ rm -Rf "${D}/usr/$(get_libdir)/java"
+ docinto "java"
+ dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+ dodir "/usr/share/doc/${PF}/java/Test"
+ insinto "/usr/share/doc/${PF}/java/Test"
+ doins "${S}"/java/Test/*.java
+ fi
+
+ docinto ""
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+ newdoc pwcheck/README README.pwcheck
+ dohtml doc/*.html
+
+ docinto "saslauthd"
+ dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+ newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+ newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+
+ newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
+ newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+
+ newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
+
+ use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
+}
+
+pkg_preinst() {
+ preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
+}
+
+pkg_postinst () {
+ # Generate an empty sasldb2 with correct permissions.
+ if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+ einfo "Generating an empty sasldb2 with correct permissions ..."
+ echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+ || die "Failed to generate sasldb2"
+ "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+ || die "Failed to delete temp user"
+ chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+ chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+ fi
+
+ if use authdaemond ; then
+ elog "You need to add a user running a service using Courier's"
+ elog "authdaemon to the 'mail' group. For example, do:"
+ elog " gpasswd -a postfix mail"
+ elog "to add the 'postfix' user to the 'mail' group."
+ fi
+
+ preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
new file mode 100644
index 000000000000..a9dd1476d2e6
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
@@ -0,0 +1,16 @@
+https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590
+https://bugs.gentoo.org/show_bug.cgi?id=392761
+
+--- cyrus-sasl-2.1.25/lib/auxprop.c~ 2011-10-20 17:33:46.423015318 +0200
++++ cyrus-sasl-2.1.25/lib/auxprop.c 2011-10-20 17:48:49.336348654 +0200
+@@ -971,6 +971,10 @@
+ }
+
+ if(!found) {
++ /* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */
++ if (!plist)
++ result = SASL_OK;
++ else
+ _sasl_log(sparams->utils->conn, SASL_LOG_DEBUG,
+ "could not find auxprop plugin, was searching for '%s'",
+ plist ? plist : "[all]");
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 0c870c665687..eee869d8b1a8 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,2 +1,3 @@
DIST grantlee-0.1.7.tar.gz 636992 RMD160 36d38a3f7e5cb09980d1fff37dc29d726c295f7b SHA1 02362a6cfeb2865e28397d8a626e95072a3ea247 SHA256 e2a86c272533d713d9d37e7f66b0c4c939795d3a7b1924349e20a8f26874663f
DIST grantlee-0.1.8.tar.gz 669703 RMD160 b8e700726aa4764f267919df2ac06bd549e1615b SHA1 322a98e10ff7be2096274f510f262b038fe63387 SHA256 d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c
+DIST grantlee-0.1.9.tar.gz 1124725 RMD160 a1a313aadbd833335f9da61a7145a2d5157c7323 SHA1 ca959294d1b45eecd848f6f079731a57832f33e4 SHA256 67f058a65ff3654d1d5f5de8e528332d1dddfd7963ec857de15d83d0acf55984
diff --git a/dev-libs/grantlee/grantlee-0.1.9.ebuild b/dev-libs/grantlee/grantlee-0.1.9.ebuild
new file mode 100644
index 000000000000..be86a3a39ea6
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-0.1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.1 2012/01/12 16:32:56 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="C++ string template engine based on the Django template system"
+HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
+SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="debug doc test"
+
+COMMON_DEPEND="
+ >=x11-libs/qt-core-4.5.0:4
+ >=x11-libs/qt-gui-4.5.0:4
+ >=x11-libs/qt-script-4.5.0:4
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen[-nodot] )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS CHANGELOG GOALS README)
+
+# Some tests fail
+RESTRICT="test"
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_build test TESTS)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+ use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidox/")
+
+ cmake-utils_src_install
+}
diff --git a/dev-libs/libgeier/Manifest b/dev-libs/libgeier/Manifest
index 302e35fca3c1..4b82044588ce 100644
--- a/dev-libs/libgeier/Manifest
+++ b/dev-libs/libgeier/Manifest
@@ -1,2 +1,3 @@
DIST libgeier-0.11.tar.gz 463121 RMD160 67bfde8950098537b41dc0844590c62911802167 SHA1 3e4a152d49afbf49ed260f71c8215a67ed6b53e4 SHA256 be786ae40c9a30e4695d0361aa575b0bb2968e0185d30a3560d5ae3e964a62c4
DIST libgeier-0.12.tar.gz 452797 RMD160 ce7f19dcf528efafeccad2502f8bbe571b0443f1 SHA1 5ad8cdf7ba1e75f94d5f5b48f41f2b74b400d1e2 SHA256 5164f2095778a3017451e1ef651510f7389a1a91e3eed0e7d9224aff50e8a35a
+DIST libgeier-0.13.tar.gz 454129 RMD160 50f4fd9b649842d5d344d6ccf29ac39354cb7c5c SHA1 69e05471223741c03480a5b59a9a5ea4907ae626 SHA256 661d72323499aa6cb9a7b35a73f4499f69885c0ea59b3e5ec0106ace970ad863
diff --git a/dev-libs/libgeier/libgeier-0.13.ebuild b/dev-libs/libgeier/libgeier-0.13.ebuild
new file mode 100644
index 000000000000..435fb7c0b470
--- /dev/null
+++ b/dev-libs/libgeier/libgeier-0.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/libgeier-0.13.ebuild,v 1.1 2012/01/12 20:09:00 xmw Exp $
+
+EAPI=2
+
+DESCRIPTION="Libgeier provides a library to access the german digital tax project ELSTER."
+HOMEPAGE="http://www.taxbird.de/"
+SRC_URI="http://www.taxbird.de/download/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+ dev-libs/libxslt
+ >=dev-libs/xmlsec-1.2.16
+ dev-libs/nspr
+ dev-libs/nss
+ sys-libs/zlib"
+DEPEND="${RDEPEND}
+ dev-lang/swig"
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc README || die
+ find "${D}" -name '*.la' -delete
+}
diff --git a/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild b/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
index 94e6a38d9c55..1e7e756eaff5 100644
--- a/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.8-r4.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-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.3 2012/01/11 18:25:49 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.4 2012/01/12 17:29:20 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples icu ipv6 python readline static-libs test"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/nss/nss-3.13.1-r1.ebuild b/dev-libs/nss/nss-3.13.1-r1.ebuild
index 63e187fc0cc0..43874de3336a 100644
--- a/dev-libs/nss/nss-3.13.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.13.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-libs/nss/nss-3.13.1-r1.ebuild,v 1.3 2012/01/11 13:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.4 2012/01/12 15:33:01 phajdan.jr Exp $
EAPI=3
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="utils"
DEPEND="dev-util/pkgconfig"
diff --git a/dev-libs/openssl/openssl-0.9.8s-r1.ebuild b/dev-libs/openssl/openssl-0.9.8s-r1.ebuild
index c6fb6b5c2356..ffa18cad28c4 100644
--- a/dev-libs/openssl/openssl-0.9.8s-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8s-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-libs/openssl/openssl-0.9.8s-r1.ebuild,v 1.2 2012/01/11 11:28:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8s-r1.ebuild,v 1.3 2012/01/12 17:32:16 phajdan.jr Exp $
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos sse2 test zlib"
RDEPEND="gmp? ( dev-libs/gmp )
diff --git a/dev-libs/openssl/openssl-1.0.0f-r1.ebuild b/dev-libs/openssl/openssl-1.0.0f-r1.ebuild
index cb5ccae093d6..eb8f3c4481b9 100644
--- a/dev-libs/openssl/openssl-1.0.0f-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0f-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-libs/openssl/openssl-1.0.0f-r1.ebuild,v 1.3 2012/01/11 19:16:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0f-r1.ebuild,v 1.4 2012/01/12 17:32:16 phajdan.jr Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index ccf2a5f96518..dfeab27e9dbe 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,2 +1,3 @@
DIST soprano-2.7.0.tar.bz2 1950793 RMD160 a23d3b6c81324b0c6548152580a0026ef4d51c00 SHA1 dada6fe40db5f230054e0dbd1c7ad7344838cf4e SHA256 5fecda00ffa713fd94b6da985ca67074c0048ba6acd5025db0d0a6081e1729ce
DIST soprano-2.7.3.tar.bz2 1953606 RMD160 43af7e951b2779e5ada813b4c84ef6bf0c760fea SHA1 dd65c5aafa0cf33b537b5c7e1e4d9466f63056e9 SHA256 f0c5202f472f64b66e3a734f5b2cba36442dd39a5196049337cbee524f05f82b
+DIST soprano-2.7.4.tar.bz2 1953706 RMD160 9e4c192165616ca5eca3ed22b9f12554530c88cc SHA1 d16231dc021bd66eebb9d1975ba075d2169a2617 SHA256 17d6f6b10d6e30a740e1267b50ea8b3a94a41942de26ede88a0492b8d278d338
diff --git a/dev-libs/soprano/soprano-2.7.4.ebuild b/dev-libs/soprano/soprano-2.7.4.ebuild
new file mode 100644
index 000000000000..c704d166911f
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.7.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.7.4.ebuild,v 1.1 2012/01/12 12:38:36 johu Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999* ]]; then
+ git_eclass="git-2"
+ EGIT_REPO_URI="git://anongit.kde.org/soprano"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit base cmake-utils flag-o-matic ${git_eclass}
+
+DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
+HOMEPAGE="http://sourceforge.net/projects/soprano"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
+
+RESTRICT=test
+# bug 281712
+
+COMMON_DEPEND="
+ >=x11-libs/qt-core-4.5.0:4
+ clucene? ( dev-cpp/clucene )
+ dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+ raptor? ( >=media-libs/raptor-2.0.4:2 )
+ redland? (
+ >=dev-libs/rasqal-0.9.26
+ >=dev-libs/redland-1.0.14
+ )
+ virtuoso? ( dev-db/libiodbc:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=x11-libs/qt-test-4.5.0:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+ virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
+pkg_setup() {
+ if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+ echo
+ ewarn "WARNING! This is an experimental ebuild of ${PN} Git tree. Use at your own risk."
+ ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+ echo
+ fi
+
+ if ! use virtuoso; then
+ echo
+ ewarn "You have explicitly disabled the default soprano backend."
+ ewarn "Applications using soprano may need at least one backend"
+ ewarn "to be functional. If you experience any problems, enable"
+ ewarn "the virtuoso USE flag."
+ echo
+ fi
+}
+
+src_configure() {
+ # Fix for missing pthread.h linking
+ # NOTE: temporarily fix until a better cmake files patch will be provided.
+ use elibc_FreeBSD && append-flags -pthread
+
+ local mycmakeargs=(
+ -DSOPRANO_BUILD_TESTS=OFF
+ -DCMAKE_SKIP_RPATH=OFF
+ -DSOPRANO_DISABLE_SESAME2_BACKEND=ON
+ $(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX)
+ $(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
+ $(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+ $(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+ $(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
+ $(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+ $(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+ $(cmake-utils_use test SOPRANO_BUILD_TESTS)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake.patch b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
new file mode 100644
index 000000000000..f2eae68c505b
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
@@ -0,0 +1,45 @@
+use standard automake rules rather than hand coding the install rules
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,24 +24,13 @@
+ MIT.TXT \
+ depcomp
+
++bin_SCRIPTS = share/zthread-config
+
+-## install the config script
+-install-exec-hook:
+- $(mkinstalldirs) $(bindir)
+- $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
++aclocaldir = $(datadir)/aclocal
++aclocal_DATA = share/zthread.m4 share/pthread.m4
+
+-## install the config script & m4 macros
+-install-data-hook:
+- $(mkinstalldirs) $(datadir)/aclocal
+- $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
+- $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
+- mkdir -p $(DESTDIR)$(includedir)/zthread
+- cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+-
+-## uninstall the config script & m4 macros
+-uninstall-local:
+- -rm -rf $(datadir)/aclocal/pthread.m4
+- -rm -rf $(datadir)/aclocal/zthread.m4
++zincludedir = $(includedir)/zthread
++zinclude_HEADERS = include/zthread/*.h
+
+ distclean-local:
+ -rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,8 +21,6 @@
+ INCLUDES = -I$(top_srcdir)/include
+ SUBDIRS=.
+
+-libdir=$(prefix)/lib
+-
+ lib_LTLIBRARIES = libZThread.la
+
+ libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
diff --git a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
new file mode 100644
index 000000000000..72163a3b12a3
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
@@ -0,0 +1,26 @@
+fix m4 warnings:
+zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD
+pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD
+
+--- a/share/zthread.m4
++++ b/share/zthread.m4
+@@ -31,7 +31,7 @@
+ dnl ZTHREAD_CXXFLAGS
+ dnl ZTHREAD_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_ZTHREAD,
++AC_DEFUN([AM_PATH_ZTHREAD],
+ [
+
+
+--- a/share/pthread.m4
++++ b/share/pthread.m4
+@@ -36,7 +36,7 @@
+ GNU Pth can also be used if it was configured with --enable-pthread.
+ EOF
+
+-AC_DEFUN(AM_DETECT_PTHREAD,
++AC_DEFUN([AM_DETECT_PTHREAD],
+ [
+
+ pthread_explicit="no"
diff --git a/dev-libs/zthread/zthread-2.3.2-r2.ebuild b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..b531b620503f
--- /dev/null
+++ b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r2.ebuild,v 1.1 2012/01/13 03:23:01 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P=ZThread-${PV}
+DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
+HOMEPAGE="http://zthread.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="debug doc kernel_linux static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
+ epatch "${FILESDIR}"/${P}-no-fpermissive.diff
+ epatch "${FILESDIR}"/${P}-m4-quote.patch
+ epatch "${FILESDIR}"/${P}-automake.patch
+
+ AT_M4DIR="share" eautoreconf
+}
+
+src_configure() {
+ local myconf
+ # Autoconf does not support --disable-debug properly.
+ use debug && myconf="--enable-debug"
+
+ econf \
+ $(use_enable kernel_linux atomic-linux) \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_compile() {
+ emake
+
+ if use doc; then
+ doxygen doc/zthread.doxygen || die
+ cp doc/documentation.html doc/html/index.html || die
+ cp doc/zthread.css doc/html/zthread.css || die
+ cp doc/bugs.js doc/html/bugs.js || die
+ fi
+}
+
+src_install() {
+ emake install DESTDIR="${ED}"
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+ use doc && dohtml doc/html/*
+
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-python/coverage/coverage-3.5.1.ebuild b/dev-python/coverage/coverage-3.5.1.ebuild
index fd55e878f0b1..c2b228608c3f 100644
--- a/dev-python/coverage/coverage-3.5.1.ebuild
+++ b/dev-python/coverage/coverage-3.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.1.ebuild,v 1.2 2011/12/18 17:53:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.1.ebuild,v 1.3 2012/01/12 22:17:46 maekke 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="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools"
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
new file mode 100644
index 000000000000..cee6189e71b7
--- /dev/null
+++ b/dev-python/gntp/Manifest
@@ -0,0 +1 @@
+DIST gntp-0.5.tar.gz 13751 RMD160 ff875b687430731412c3cc72321ede5dceb3ce15 SHA1 955182993bbbed39ec4cb09b441786353971507a SHA256 5f4f752f54a800f32237e29f8604df8794c1dcb75d66a445abd6396a18790a73
diff --git a/dev-python/gntp/gntp-0.5.ebuild b/dev-python/gntp/gntp-0.5.ebuild
new file mode 100644
index 000000000000..3e329eb9a2ad
--- /dev/null
+++ b/dev-python/gntp/gntp-0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gntp/gntp-0.5.ebuild,v 1.1 2012/01/12 18:32:42 naota Exp $
+
+EAPI=4
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
+HOMEPAGE="https://github.com/kfdm/gntp"
+SRC_URI="https://github.com/kfdm/gntp/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ default
+ mv * ${P}
+}
diff --git a/dev-python/gntp/metadata.xml b/dev-python/gntp/metadata.xml
new file mode 100644
index 000000000000..a6e3636c60a1
--- /dev/null
+++ b/dev-python/gntp/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+naota@gentoo.org
+Naohiro Aota
+
+
+
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
index 24cba07d1004..22a8e4f68c42 100644
--- a/dev-ruby/iobuffer/Manifest
+++ b/dev-ruby/iobuffer/Manifest
@@ -1,2 +1 @@
-DIST iobuffer-0.1.3.gem 10240 RMD160 3e027318035569a9461bba7b59bb239b64a6b05e SHA1 04100456e7fc8ead34d13ac5e8f07d888dfc122b SHA256 ab571c7265ad839bcc05f33f6098da976bcff1b1e63ea077a6603efc8e58647f
DIST iobuffer-1.0.0.gem 11776 RMD160 c510a4b55c1429f3849779709ba840e43a4a8170 SHA1 a5ce4e05d50534fb26f9217453f51f109b1b8803 SHA256 b5a99e964f52aff860d6a16c91e79e3bd8c7baad8423bee935634cea8c44c265
diff --git a/dev-ruby/iobuffer/iobuffer-0.1.3-r1.ebuild b/dev-ruby/iobuffer/iobuffer-0.1.3-r1.ebuild
deleted file mode 100644
index 5b897e519dd6..000000000000
--- a/dev-ruby/iobuffer/iobuffer-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/iobuffer/iobuffer-0.1.3-r1.ebuild,v 1.2 2010/12/26 14:03:25 graaff Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="IO::Buffer is a fast byte queue which is primarily intended for non-blocking I/O applications"
-HOMEPAGE="http://mynyml.com/ruby/flexible-continuous-testing"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-SLOT="0"
-IUSE=""
-
-each_ruby_prepare() {
- sed -i "s/lib\/iobuffer/ext\/iobuffer/" spec/buffer_spec.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext extconf.rb || die "Failed to configure the extension."
-}
-
-each_ruby_compile() {
- emake -C ext || die "Failed to compile the extension."
-}
-
-each_ruby_test() {
- ${RUBY} -Iext -S spec spec/buffer_spec.rb
-}
-
-each_ruby_install() {
- emake -C ext install DESTDIR="${D}" || die "Failed to install the extension."
-}
diff --git a/dev-ruby/iobuffer/iobuffer-1.0.0.ebuild b/dev-ruby/iobuffer/iobuffer-1.0.0.ebuild
index 42c1e2e2c032..95c3415e3068 100644
--- a/dev-ruby/iobuffer/iobuffer-1.0.0.ebuild
+++ b/dev-ruby/iobuffer/iobuffer-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# 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-ruby/iobuffer/iobuffer-1.0.0.ebuild,v 1.1 2011/01/02 10:51:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/iobuffer/iobuffer-1.0.0.ebuild,v 1.2 2012/01/13 07:54:50 graaff Exp $
EAPI="2"
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc"
diff --git a/dev-ruby/metadata.xml b/dev-ruby/metadata.xml
index 06fc07b4278f..42a8e90ecd8e 100644
--- a/dev-ruby/metadata.xml
+++ b/dev-ruby/metadata.xml
@@ -18,7 +18,7 @@
ユーティリティが含まれます。
- De dev-ruby categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+ De categorie dev-ruby bevat bibliotheken en hulpmiddelen voor het gebruik
van de programmeertaal Ruby.
diff --git a/dev-ruby/rev/rev-0.3.2.ebuild b/dev-ruby/rev/rev-0.3.2.ebuild
index 563e514d39fc..62ff5805d6f7 100644
--- a/dev-ruby/rev/rev-0.3.2.ebuild
+++ b/dev-ruby/rev/rev-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/rev-0.3.2.ebuild,v 1.2 2010/12/26 14:04:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rev/rev-0.3.2.ebuild,v 1.3 2012/01/13 07:56:06 graaff Exp $
EAPI="2"
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
RUBY_FAKEGEM_EXTRADOC="CHANGES README.textile"
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index d9bf6ceef3fd..7e34b27989fd 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1 +1,2 @@
DIST bustle-0.2.3.tar.gz 39314 RMD160 dab031c59f33a4a11ba86765d5e7f01a9320f1cb SHA1 8289622e4268d1e60036917507cd69058b9c9ba2 SHA256 2a2d0633d6a0714c845715f6aa4392b08d1d241187f22b27122bb1bfcbf6d23a
+DIST bustle-0.3.1.tar.gz 72042 RMD160 252ca0359ed2c80661df8c97757dc1e7c32835e6 SHA1 a25d5e6691f4dc367605f7897b2706f0abf231e5 SHA256 bf6c337d0230a043a203a5669353a1ce75d1041164234477696bdea3f19c0170
diff --git a/dev-util/bustle/bustle-0.3.1.ebuild b/dev-util/bustle/bustle-0.3.1.ebuild
new file mode 100644
index 000000000000..849a3530eb6f
--- /dev/null
+++ b/dev-util/bustle/bustle-0.3.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.3.1.ebuild,v 1.1 2012/01/12 17:16:24 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal toolchain-funcs
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="http://willthompson.co.uk/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/pango
+ gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+ dev-haskell/binary
+ >=dev-haskell/cabal-1.6
+ dev-haskell/cairo
+ =dev-haskell/dbus-core-0.9*
+ dev-haskell/glade
+ dev-haskell/glib
+ >dev-haskell/gtk-0.11
+ dev-haskell/mtl
+ dev-haskell/pango
+ dev-haskell/parsec
+ dev-haskell/pcap
+ dev-haskell/text
+ >=dev-lang/ghc-6.10.1"
+
+src_compile() {
+ # compile haskell part
+ cabal_src_compile || die "could not build haskell parts"
+
+ # compile C part
+ emake \
+ "CC=$(tc-getCC)" \
+ "CFLAGS=${CFLAGS}" \
+ "CPPFLAGS=${CPPFLAGS}" \
+ "LDFLAGS=${LDFLAGS}" \
+ || die "building C part failed"
+}
+
+src_install() {
+ # install haskell part
+ cabal_src_install || die "could not install haskell parts"
+
+ # install C part
+ for bin in bustle-dbus-monitor bustle-pcap
+ do
+ dobin "${S}"/dist/build/"$bin" || die "could not install '$bin'"
+ done
+
+ dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index 2f5607ea9893..c7324b97b3e2 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -5,4 +5,7 @@
haskell@gentoo.org
+
+ Draw pretty sequence diagrams of D-Bus traffic
+
diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass
index 4d1778d63a67..7c4b12970b95 100644
--- a/eclass/php-ext-source-r2.eclass
+++ b/eclass/php-ext-source-r2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.19 2012/01/11 18:30:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.21 2012/01/13 05:38:42 olemarkus Exp $
# @ECLASS: php-ext-source-r2.eclass
# @MAINTAINER:
@@ -85,8 +85,12 @@ RDEPEND="${RDEPEND}
${PHPDEPEND}
${PHP_EXT_OPTIONAL_USE:+ )}"
-DEPEND="${DEPEND}
-${PHPDEPEND}"
+#DEPEND="${DEPEND}
+# ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
+# || ( ${SELFDEPEND} )
+# ${PHPDEPEND}
+# ${PHP_EXT_OPTIONAL_USE:+ )}
+#"
# @FUNCTION: php-ext-source-r2_src_unpack
# @DESCRIPTION:
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild
index 30ff191b4b2f..79937b3036dd 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild,v 1.1 2011/11/28 05:57:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.4.ebuild,v 1.2 2012/01/12 19:18:10 tetromino Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://intgat.tigress.co.uk/rmy/extensions/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="app-admin/eselect-gnome-shell-extensions
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild
index 9589bc6af87a..ff6fe50fc657 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild,v 1.1 2012/01/11 06:13:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.3.6.ebuild,v 1.2 2012/01/12 19:18:10 tetromino Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://intgat.tigress.co.uk/rmy/extensions/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="app-admin/eselect-gnome-shell-extensions
diff --git a/kde-misc/plasma-widget-message-indicator/Manifest b/kde-misc/plasma-widget-message-indicator/Manifest
index 0084a69dc8f9..411e4aafdf57 100644
--- a/kde-misc/plasma-widget-message-indicator/Manifest
+++ b/kde-misc/plasma-widget-message-indicator/Manifest
@@ -1 +1 @@
-DIST plasma-widget-message-indicator-0.5.6.tar.bz2 30506 RMD160 6dc7722845c26fc8250e1d4305e2a091549f9d8a SHA1 939658d8ecbfaceeb32b7745ddaccaa594afdd44 SHA256 3094cf893a076a6be3464f0fe78a6d33943f13eb4e2001741b9fcd59e9d6fa85
+DIST plasma-widget-message-indicator-0.5.8.tar.bz2 30641 RMD160 69547fd0a7826fc4595428b0f6b7a21b0b6a9333 SHA1 2bd2a670be498fcf3d237353a355503e6a76e45c SHA256 cb5e9c6f6fe1075e508868759dfebad654508c84a3c2a61264eca6b42185de7c
diff --git a/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.6.ebuild b/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.8.ebuild
similarity index 73%
rename from kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.6.ebuild
rename to kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.8.ebuild
index 5568aa956643..ea2db9cc4a90 100644
--- a/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.6.ebuild
+++ b/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.6.ebuild,v 1.6 2011/10/29 00:15:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-widget-message-indicator/plasma-widget-message-indicator-0.5.8.ebuild,v 1.1 2012/01/12 19:05:21 johu Exp $
EAPI=4
@@ -20,6 +20,7 @@ DEPEND="
>=dev-libs/libdbusmenu-qt-0.3.0
>=dev-libs/libindicate-qt-0.2.5
"
-RDEPEND="${DEPEND}
- !kde-misc/plasma-indicatordisplay
-"
+RDEPEND="${DEPEND}"
+
+# 1 test fails
+RESTRICT="test"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index eec9bad10275..d3f83d242884 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1 +1,2 @@
DIST 114856-wacomtablet-v1.3.4.tar.bz2 239438 RMD160 717da672204b5085204d63adc135681e071dee4c SHA1 f3b628c329c49bfc1e48a73be7ed89157add9fc5 SHA256 816e7d522b1ed549d36b0b24a6ace202b451c3c6d7dd58a05e1b469b1859d16f
+DIST 114856-wacomtablet-v1.3.6.tar.bz2 242116 RMD160 af3f53addeb77a3192c5fadb6b605ec76cc7f110 SHA1 262a5da342d7a01eeaaef53ce46856d5f9e14fef SHA256 1b36ba20b118d17b52433c5845e179d7feed5257caa95389e93eccb6ee01b424
diff --git a/kde-misc/wacomtablet/wacomtablet-1.3.6.ebuild b/kde-misc/wacomtablet/wacomtablet-1.3.6.ebuild
new file mode 100644
index 000000000000..f723d2ff4b8d
--- /dev/null
+++ b/kde-misc/wacomtablet/wacomtablet-1.3.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/wacomtablet/wacomtablet-1.3.6.ebuild,v 1.1 2012/01/12 17:10:14 johu Exp $
+
+EAPI=4
+
+MY_P=${PN}-v${PV}
+KDE_LINGUAS="bs cs da de el en_GB eo es et fr ga ja km lt mai nb nds nl pa pl pt
+pt_BR ro sk sv tr ug uk zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KControl module for wacom tablets"
+HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/114856-${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ >=x11-drivers/xf86-input-wacom-0.11.0
+"
+
+S=${WORKDIR}/${MY_P}
diff --git a/licenses/as-is b/licenses/as-is
index 68bfc22a33b2..c7d22a33c4d3 100644
--- a/licenses/as-is
+++ b/licenses/as-is
@@ -9,7 +9,7 @@ similar to:
documentation, and that the same name not be used in advertising or
publicity pertaining to distribution of the software without specific,
written prior permission. We make no representations about the
- suitability this software for any purpose. It is provided "as is"
+ suitability of this software for any purpose. It is provided "as is"
without express or implied warranty.
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
index 7c03fc1217bb..ddc6420b0272 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-9.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/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild,v 1.2 2012/01/11 13:13:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild,v 1.3 2012/01/12 15:30:41 phajdan.jr Exp $
EAPI="3"
@@ -23,7 +23,7 @@ SRC_URI="
HOMEPAGE="http://www.mozilla.com/thunderbird"
RESTRICT="strip"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="+crashreporter"
diff --git a/mail-client/thunderbird/thunderbird-9.0.ebuild b/mail-client/thunderbird/thunderbird-9.0.ebuild
index 080652a6751d..fc96710e7daf 100644
--- a/mail-client/thunderbird/thunderbird-9.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-9.0.ebuild,v 1.5 2012/01/11 13:13:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-9.0.ebuild,v 1.6 2012/01/12 15:29:25 phajdan.jr Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -14,7 +14,7 @@ EMVER="1.3.4"
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-KEYWORDS="~alpha amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
diff --git a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild b/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
index 6deb82bff631..596647a3da02 100644
--- a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
+++ b/mail-mta/mini-qmail/mini-qmail-1.06.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/mail-mta/mini-qmail/mini-qmail-1.06.ebuild,v 1.6 2012/01/08 03:39:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/mini-qmail/mini-qmail-1.06.ebuild,v 1.7 2012/01/12 21:05:43 maekke Exp $
GENQMAIL_PV=20080406
@@ -17,7 +17,7 @@ SRC_URI="mirror://qmail/netqmail-${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 arm ~hppa ~mips ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
index 1ca820642ede..1fa438af20ec 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.4.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-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild,v 1.3 2012/01/09 16:02:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild,v 1.4 2012/01/12 21:08:08 maekke Exp $
inherit font
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
SRC_URI="https://fedorahosted.org/releases/l/o/lohit/${P}.tar.gz"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
DOCS="AUTHORS ChangeLog README"
diff --git a/media-gfx/potrace/potrace-1.10-r1.ebuild b/media-gfx/potrace/potrace-1.10-r1.ebuild
index 1bede908a52b..ec53b3afc687 100644
--- a/media-gfx/potrace/potrace-1.10-r1.ebuild
+++ b/media-gfx/potrace/potrace-1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.10-r1.ebuild,v 1.7 2011/12/09 11:36:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.10-r1.ebuild,v 1.8 2012/01/12 22:07:45 maekke Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="metric static-libs"
RDEPEND="sys-libs/zlib"
diff --git a/media-libs/libvisio/libvisio-0.0.12.ebuild b/media-libs/libvisio/libvisio-0.0.12.ebuild
index c4182105d450..4f3fe63c3a04 100644
--- a/media-libs/libvisio/libvisio-0.0.12.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.12.ebuild,v 1.1 2012/01/09 16:08:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.12.ebuild,v 1.2 2012/01/12 10:06:15 scarabeus Exp $
EAPI=4
@@ -23,6 +23,7 @@ RDEPEND="
app-text/libwpg:0.2
"
DEPEND="${DEPEND}
+ >=dev-libs/boost-1.46
dev-util/pkgconfig
sys-devel/libtool
doc? ( app-doc/doxygen )
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 4a992bcaf5c9..50c92c9de551 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-9999.ebuild,v 1.6 2011/12/11 12:29:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-9999.ebuild,v 1.7 2012/01/12 10:06:15 scarabeus Exp $
EAPI=4
@@ -23,6 +23,7 @@ RDEPEND="
app-text/libwpg:0.2
"
DEPEND="${DEPEND}
+ >=dev-libs/boost-1.46
dev-util/pkgconfig
sys-devel/libtool
doc? ( app-doc/doxygen )
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 19a458f9fdef..40adba589cee 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -1,12 +1,12 @@
-# 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/media-libs/opencv/opencv-2.3.0.ebuild,v 1.11 2011/11/22 22:38:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.12 2012/01/12 16:03:33 vapier Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
-inherit base toolchain-funcs cmake-utils fortran-2 python
+inherit base toolchain-funcs cmake-utils python
MY_P=OpenCV-${PV}
@@ -68,7 +68,6 @@ CMAKE_BUILD_TYPE="Release"
S=${WORKDIR}/${MY_P}
pkg_setup() {
- fortran-2_pkg_setup
if use python; then
python_set_active_version 2
python_pkg_setup
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index 354f50bcb983..2f6ad8ab1382 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1 +1,2 @@
DIST OpenGTL-0.9.15.1.tar.bz2 496181 RMD160 b161177daa57b104f45cfa3eafcc91b2203a60aa SHA1 ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a SHA256 7ee13c09b0a0d7099367b713fce5a3a14cf72865bf6169ebc39ec4958c445028
+DIST OpenGTL-0.9.15.2.tar.bz2 495966 RMD160 e77ba56b0dfe92361724aae02c5817248355b52d SHA1 b6beea4086a0907dcdb326d421d253f368689b45 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2
diff --git a/media-libs/opengtl/opengtl-0.9.15.2.ebuild b/media-libs/opengtl/opengtl-0.9.15.2.ebuild
new file mode 100644
index 000000000000..8de3a2e71a8f
--- /dev/null
+++ b/media-libs/opengtl/opengtl-0.9.15.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.15.2.ebuild,v 1.1 2012/01/12 13:04:33 johu Exp $
+
+EAPI=4
+
+MY_P="OpenGTL-${PV}"
+
+inherit cmake-utils
+
+DESCRIPTION="Collection of libraries for graphics transformation algorithms"
+HOMEPAGE="http://opengtl.org/"
+SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+ media-libs/libpng
+
- De media-sound categorie bevat applicaties voor geluid en muziek.
+ De categorie media-sound bevat applicaties voor geluid en muziek.
Nhóm media-sound chứa các ứng dụng liên quan đến âm thanh, nhạc, tiếng nói.
diff --git a/media-sound/mpc/mpc-0.21.ebuild b/media-sound/mpc/mpc-0.21.ebuild
index 147ef85c8c9a..dc8e4463892d 100644
--- a/media-sound/mpc/mpc-0.21.ebuild
+++ b/media-sound/mpc/mpc-0.21.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/mpc/mpc-0.21.ebuild,v 1.6 2012/01/05 00:48:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.21.ebuild,v 1.7 2012/01/12 21:10:15 maekke Exp $
EAPI=4
inherit bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc ~x86"
IUSE="iconv"
RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
new file mode 100644
index 000000000000..58ae1c3f91b0
--- /dev/null
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v 1.1 2012/01/13 07:04:25 radhermit Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs flag-o-matic eutils git-2
+
+EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+SRC_URI=""
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS=""
+IUSE="aac +mp3"
+
+DEPEND="media-libs/libao
+ net-libs/gnutls
+ aac? ( media-libs/faad2 )
+ mp3? ( media-libs/libmad )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mp3 aac )"
+
+# Only releases are tested since patches required for testing often break
+RESTRICT="test"
+
+src_compile() {
+ local myconf
+ ! use aac && myconf+=" DISABLE_FAAD=1"
+ ! use mp3 && myconf+=" DISABLE_MAD=1"
+
+ append-cflags -std=c99
+ tc-export CC
+ emake ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+ dodoc ChangeLog README
+
+ docinto contrib
+ dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+ docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/metadata/cache/app-admin/fam-2.7.0-r6 b/metadata/cache/app-admin/fam-2.7.0-r6
index 57ff50a081ba..ecb5efdf42ff 100644
--- a/metadata/cache/app-admin/fam-2.7.0-r6
+++ b/metadata/cache/app-admin/fam-2.7.0-r6
@@ -6,7 +6,7 @@ ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/
http://oss.sgi.com/projects/fam/
GPL-2 LGPL-2.1
FAM, the File Alteration Monitor
-~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
autotools eutils libtool multilib portability toolchain-funcs user
static-libs
diff --git a/metadata/cache/app-arch/sharutils-4.11.1 b/metadata/cache/app-arch/sharutils-4.11.1
index 3f1e6c8db10c..9ed0d91d9d76 100644
--- a/metadata/cache/app-arch/sharutils-4.11.1
+++ b/metadata/cache/app-arch/sharutils-4.11.1
@@ -6,7 +6,7 @@ mirror://gnu/sharutils/sharutils-4.11.1.tar.bz2
http://www.gnu.org/software/sharutils/
GPL-3
Tools to deal with shar archives
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
eutils multilib portability toolchain-funcs user
nls
diff --git a/metadata/cache/app-benchmarks/ioping-0.6 b/metadata/cache/app-benchmarks/ioping-0.6
new file mode 100644
index 000000000000..da2f36af912b
--- /dev/null
+++ b/metadata/cache/app-benchmarks/ioping-0.6
@@ -0,0 +1,22 @@
+
+
+0
+http://ioping.googlecode.com/files/ioping-0.6.tar.gz
+
+http://code.google.com/p/ioping/
+GPL-3
+Simple disk I/0 latency measuring tool
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib portability toolchain-funcs user
+
+
+
+
+4
+
+compile prepare
+
+
+
+
+
diff --git a/metadata/cache/app-cdr/k9copy-2.3.6 b/metadata/cache/app-cdr/k9copy-2.3.6
deleted file mode 100644
index c9bfa2ae50f8..000000000000
--- a/metadata/cache/app-cdr/k9copy-2.3.6
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-mirror://sourceforge/k9copy/k9copy-2.3.6-Source.tar.gz
-
-http://k9copy.sourceforge.net/
-GPL-2
-k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr@Latn linguas_sr linguas_tr linguas_zh_TW +handbook aqua kdeenablefinal
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-cdr/k9copy-2.3.8 b/metadata/cache/app-cdr/k9copy-2.3.8
new file mode 100644
index 000000000000..8f791b34e31b
--- /dev/null
+++ b/metadata/cache/app-cdr/k9copy-2.3.8
@@ -0,0 +1,22 @@
+media-libs/libdvdread media-libs/libmpeg2 media-libs/xine-lib virtual/ffmpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+media-libs/libdvdread media-libs/libmpeg2 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_es_AR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es_AR(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+mirror://sourceforge/k9copy/k9copy-2.3.8-Source.tar.gz
+
+http://k9copy.sourceforge.net/
+GPL-2
+k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_es_AR linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-crypt/pius-2.0.9 b/metadata/cache/app-crypt/pius-2.0.9
new file mode 100644
index 000000000000..8dd94bf8ea97
--- /dev/null
+++ b/metadata/cache/app-crypt/pius-2.0.9
@@ -0,0 +1,22 @@
+app-crypt/gnupg >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+app-crypt/gnupg dev-lang/perl >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://sourceforge/pgpius/pius-2.0.9.tar.bz2
+
+http://www.phildev.net/pius/
+GPL-2
+A tool for signing and email all UIDs on a set of PGP keys.
+~amd64 ~x86
+multilib python toolchain-funcs
+
+
+
+
+4
+
+install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-editors/mg-20110120 b/metadata/cache/app-editors/mg-20110120
deleted file mode 100644
index e016d793b66f..000000000000
--- a/metadata/cache/app-editors/mg-20110120
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses
-sys-libs/ncurses
-0
-http://homepage.boetes.org/software/mg/mg-20110120.tar.gz
-
-http://homepage.boetes.org/software/mg/
-public-domain BSD
-Micro GNU/emacs, a port from the BSDs
-alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-multilib toolchain-funcs
-livecd
-
-
-
-3
-
-compile configure install postinst
-
-
-
-
-
diff --git a/metadata/cache/app-emacs/cedet-1.0.1 b/metadata/cache/app-emacs/cedet-1.0.1
index cc4868131ea5..be047be79813 100644
--- a/metadata/cache/app-emacs/cedet-1.0.1
+++ b/metadata/cache/app-emacs/cedet-1.0.1
@@ -6,7 +6,7 @@ mirror://sourceforge/cedet/cedet-1.0.1.tar.gz
http://cedet.sourceforge.net/
GPL-2 FDL-1.2
CEDET: Collection of Emacs Development Environment Tools
-amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
elisp elisp-common eutils multilib portability toolchain-funcs user
diff --git a/metadata/cache/app-emulation/libguestfs-1.8.16 b/metadata/cache/app-emulation/libguestfs-1.8.16
index d2503e2074e0..3144d02e89ae 100644
--- a/metadata/cache/app-emulation/libguestfs-1.8.16
+++ b/metadata/cache/app-emulation/libguestfs-1.8.16
@@ -1,4 +1,4 @@
-virtual/perl-Getopt-Long >=dev-perl/Sys-Virt-0.2.4 >=app-misc/hivex-1.2.1[perl] dev-perl/libintl-perl dev-perl/String-ShellQuote dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools perl? ( virtual/perl-ExtUtils-MakeMaker ) fuse? ( sys-fs/fuse ) readline? ( sys-libs/readline ) doc? ( dev-libs/libxml2 ) ocaml? ( dev-lang/ocaml dev-ml/findlib dev-ml/xml-light ) ruby? ( dev-lang/ruby dev-ruby/rake ) java? ( virtual/jre ) haskell? ( dev-lang/ghc ) java? ( >=virtual/jdk-1.6 source? ( app-arch/zip ) ) doc? ( app-text/po4a ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+virtual/perl-Getopt-Long >=dev-perl/Sys-Virt-0.2.4 >=app-misc/hivex-1.2.1[perl] dev-perl/libintl-perl dev-perl/String-ShellQuote dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools perl? ( virtual/perl-ExtUtils-MakeMaker ) fuse? ( sys-fs/fuse ) readline? ( sys-libs/readline ) doc? ( dev-libs/libxml2 ) ocaml? ( dev-lang/ocaml dev-ml/findlib dev-ml/xml-light ) ruby? ( dev-lang/ruby dev-ruby/rake ) java? ( virtual/jre ) haskell? ( dev-lang/ghc ) java? ( >=virtual/jdk-1.6 source? ( app-arch/zip ) ) doc? ( app-text/po4a ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
virtual/perl-Getopt-Long >=dev-perl/Sys-Virt-0.2.4 >=app-misc/hivex-1.2.1[perl] dev-perl/libintl-perl dev-perl/String-ShellQuote dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools perl? ( virtual/perl-ExtUtils-MakeMaker ) fuse? ( sys-fs/fuse ) readline? ( sys-libs/readline ) doc? ( dev-libs/libxml2 ) ocaml? ( dev-lang/ocaml dev-ml/findlib dev-ml/xml-light ) ruby? ( dev-lang/ruby dev-ruby/rake ) java? ( virtual/jre ) haskell? ( dev-lang/ghc ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) php? ( || ( =app-emulation/libguestfs-1.8.16[php_targets_php5-3] =app-emulation/libguestfs-1.8.16[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
0
http://libguestfs.org/download/1.8-stable/libguestfs-1.8.16.tar.gz http://rion-overlay.googlecode.com/files/libguestfs-1.7.18-x86_64.tar.gz
diff --git a/metadata/cache/app-office/skrooge-0.9.1 b/metadata/cache/app-office/skrooge-0.9.1
deleted file mode 100644
index b00987b7ed3c..000000000000
--- a/metadata/cache/app-office/skrooge-0.9.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libofx-0.9.1 app-crypt/qca:2 x11-libs/qt-sql:4[sqlite] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=dev-libs/libofx-0.9.1 app-crypt/qca:2 x11-libs/qt-sql:4[sqlite] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-http://skrooge.org/files/skrooge-0.9.1.tar.bz2
-
-http://skrooge.org/
-GPL-3
-personal finances manager for KDE4, aiming at being simple and intuitive
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/skrooge-1.1.1 b/metadata/cache/app-office/skrooge-1.1.1
new file mode 100644
index 000000000000..550271369458
--- /dev/null
+++ b/metadata/cache/app-office/skrooge-1.1.1
@@ -0,0 +1,22 @@
+app-crypt/qca:2 dev-libs/grantlee >=dev-libs/libofx-0.9.1 x11-libs/qt-sql:4[sqlite] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+app-crypt/qca:2 dev-libs/grantlee >=dev-libs/libofx-0.9.1 x11-libs/qt-sql:4[sqlite] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+http://skrooge.org/files/skrooge-1.1.1.tar.bz2
+
+http://skrooge.org/
+GPL-3
+personal finances manager for KDE4, aiming at being simple and intuitive
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN +handbook aqua kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/taxbird-0.18 b/metadata/cache/app-office/taxbird-0.18
new file mode 100644
index 000000000000..cbd45dba20e8
--- /dev/null
+++ b/metadata/cache/app-office/taxbird-0.18
@@ -0,0 +1,22 @@
+>=dev-libs/libgeier-0.13 >=gnome-extra/gtkhtml-3.8:3.14 gnome-base/libgnomeui sys-devel/gettext >=dev-scheme/guile-1.8.0[regex,deprecated]
+>=dev-libs/libgeier-0.13 >=gnome-extra/gtkhtml-3.8:3.14 gnome-base/libgnomeui sys-devel/gettext >=dev-scheme/guile-1.8.0[regex,deprecated]
+0
+http://www.taxbird.de/download/taxbird/0.18/taxbird-0.18.tar.gz
+
+http://www.taxbird.de/
+GPL-2
+Taxbird provides a GUI to submit tax forms to the german digital tax project ELSTER.
+~amd64 ~x86
+eutils fdo-mime multilib portability toolchain-funcs user
+
+
+
+
+2
+
+install postinst
+
+
+
+
+
diff --git a/metadata/cache/app-office/texmaker-3.2.2 b/metadata/cache/app-office/texmaker-3.2.2
new file mode 100644
index 000000000000..7d26c2a325b2
--- /dev/null
+++ b/metadata/cache/app-office/texmaker-3.2.2
@@ -0,0 +1,22 @@
+app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 >=app-text/hunspell-1.2.4 dev-util/pkgconfig
+app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 >=app-text/hunspell-1.2.4 virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
+0
+http://www.xm1math.net/texmaker/texmaker-3.2.2.tar.bz2
+
+http://www.xm1math.net/texmaker/
+GPL-2
+A nice LaTeX-IDE
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+base eutils multilib portability prefix qt4-r2 toolchain-funcs user versionator
+
+
+
+
+3
+
+compile configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-text/dvisvgm-1.0.10 b/metadata/cache/app-text/dvisvgm-1.0.10
index 1d1f4d689c3a..773c12176fe5 100644
--- a/metadata/cache/app-text/dvisvgm-1.0.10
+++ b/metadata/cache/app-text/dvisvgm-1.0.10
@@ -6,7 +6,7 @@ test
http://dvisvgm.sourceforge.net/
GPL-3
Converts DVI files to SVG
-~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
test
diff --git a/metadata/cache/app-text/dvisvgm-1.0.9-r1 b/metadata/cache/app-text/dvisvgm-1.0.9-r1
index 8534f5cfbe13..000fbbef2016 100644
--- a/metadata/cache/app-text/dvisvgm-1.0.9-r1
+++ b/metadata/cache/app-text/dvisvgm-1.0.9-r1
@@ -6,7 +6,7 @@ test
http://dvisvgm.sourceforge.net/
GPL-3
Converts DVI files to SVG
-~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
test
diff --git a/metadata/cache/app-text/lcdf-typetools-2.91 b/metadata/cache/app-text/lcdf-typetools-2.91
index ba4ce5bbef45..6ffe191edd9b 100644
--- a/metadata/cache/app-text/lcdf-typetools-2.91
+++ b/metadata/cache/app-text/lcdf-typetools-2.91
@@ -6,7 +6,7 @@ http://www.lcdf.org/type/lcdf-typetools-2.91.tar.gz
http://www.lcdf.org/type/#typetools
GPL-2
Font utilities for eg manipulating OTF
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+kpathsea
diff --git a/metadata/cache/app-text/pspdftool-0.03 b/metadata/cache/app-text/pspdftool-0.03
index 4863b8bf12a8..8f0570e93cfa 100644
--- a/metadata/cache/app-text/pspdftool-0.03
+++ b/metadata/cache/app-text/pspdftool-0.03
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib )
+zlib? ( sys-libs/zlib ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
zlib? ( sys-libs/zlib )
0
mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
@@ -7,14 +7,14 @@ http://sourceforge.net/projects/pspdftool
GPL-2
Tool for prepress preparation of PDF and PostScript documents
~amd64 ~x86
-autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
+autotools eutils libtool multilib portability toolchain-funcs user
zlib
4
-compile configure install prepare test
+configure install prepare
diff --git a/metadata/cache/app-text/pspdftool-9999 b/metadata/cache/app-text/pspdftool-9999
index 61e21898ce60..2857c5c46284 100644
--- a/metadata/cache/app-text/pspdftool-9999
+++ b/metadata/cache/app-text/pspdftool-9999
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib ) dev-vcs/subversion net-misc/rsync
+zlib? ( sys-libs/zlib ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/subversion net-misc/rsync
zlib? ( sys-libs/zlib )
0
@@ -7,14 +7,14 @@ http://sourceforge.net/projects/pspdftool
GPL-2
Tool for prepress preparation of PDF and PostScript documents
-autotools autotools-utils eutils libtool multilib portability subversion toolchain-funcs user
+autotools eutils libtool multilib portability subversion toolchain-funcs user
zlib
4
-compile configure install preinst prepare test unpack
+configure install preinst prepare unpack
diff --git a/metadata/cache/app-text/xmlto-0.0.22 b/metadata/cache/app-text/xmlto-0.0.22
deleted file mode 100644
index bd19e06150cd..000000000000
--- a/metadata/cache/app-text/xmlto-0.0.22
+++ /dev/null
@@ -1,22 +0,0 @@
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 ) sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-0
-https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.22.tar.bz2
-
-https://fedorahosted.org/xmlto/
-GPL-2
-A bash script for converting XML and DocBook formatted documents to a variety of output formats
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
-autotools eutils libtool multilib portability toolchain-funcs user
-latex
-
-
-
-2
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-text/xmlto-0.0.23 b/metadata/cache/app-text/xmlto-0.0.23
deleted file mode 100644
index f98086341a78..000000000000
--- a/metadata/cache/app-text/xmlto-0.0.23
+++ /dev/null
@@ -1,22 +0,0 @@
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 ) sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-0
-https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
-
-https://fedorahosted.org/xmlto/
-GPL-2
-A bash script for converting XML and DocBook formatted documents to a variety of output formats
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-autotools eutils libtool multilib portability toolchain-funcs user
-latex
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-text/xmlto-0.0.24 b/metadata/cache/app-text/xmlto-0.0.24
deleted file mode 100644
index 6f859ffbad2e..000000000000
--- a/metadata/cache/app-text/xmlto-0.0.24
+++ /dev/null
@@ -1,22 +0,0 @@
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 ) sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-0
-https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.24.tar.bz2
-
-https://fedorahosted.org/xmlto/
-GPL-2
-A bash script for converting XML and DocBook formatted documents to a variety of output formats
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-autotools eutils libtool multilib portability toolchain-funcs user
-latex
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-text/xmlto-0.0.24-r1 b/metadata/cache/app-text/xmlto-0.0.24-r1
index 53ee661890b7..ecf79f5f0a85 100644
--- a/metadata/cache/app-text/xmlto-0.0.24-r1
+++ b/metadata/cache/app-text/xmlto-0.0.24-r1
@@ -6,7 +6,7 @@ https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.24.tar.bz2 mirror://gentoo
https://fedorahosted.org/xmlto/
GPL-2
script for converting XML and DocBook formatted documents to a variety of output formats
-alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
eutils multilib portability toolchain-funcs user
latex
diff --git a/metadata/cache/app-text/xmlto-0.0.25 b/metadata/cache/app-text/xmlto-0.0.25
new file mode 100644
index 000000000000..f8952835f0c0
--- /dev/null
+++ b/metadata/cache/app-text/xmlto-0.0.25
@@ -0,0 +1,22 @@
+>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash dev-libs/libxslt sys-apps/grep || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 ) sys-devel/flex
+>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash dev-libs/libxslt sys-apps/grep || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
+0
+https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.25.tar.bz2
+
+https://fedorahosted.org/xmlto/
+GPL-2
+script for converting XML and DocBook formatted documents to a variety of output formats
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+eutils multilib portability toolchain-funcs user
+latex
+
+
+
+4
+
+configure prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/data-binary-ieee754-0.4.2.1 b/metadata/cache/dev-haskell/data-binary-ieee754-0.4.2.1
new file mode 100644
index 000000000000..9a2ede3c0176
--- /dev/null
+++ b/metadata/cache/dev-haskell/data-binary-ieee754-0.4.2.1
@@ -0,0 +1,22 @@
+=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/data-binary-ieee754/0.4.2.1/data-binary-ieee754-0.4.2.1.tar.gz
+
+http://john-millikin.com/software/data-binary-ieee754/
+MIT
+Parser/Serialiser for IEEE-754 floating-point values
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/dbus-core-0.9.2.1 b/metadata/cache/dev-haskell/dbus-core-0.9.2.1
new file mode 100644
index 000000000000..6d63f9273d75
--- /dev/null
+++ b/metadata/cache/dev-haskell/dbus-core-0.9.2.1
@@ -0,0 +1,22 @@
+>=dev-haskell/binary-0.4 =dev-haskell/data-binary-ieee754-0.3 =dev-haskell/network-2.2 =dev-haskell/parsec-2.0 =dev-haskell/text-0.11.1.5 =dev-haskell/vector-0.7 =dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/binary-0.4 =dev-haskell/data-binary-ieee754-0.3 =dev-haskell/network-2.2 =dev-haskell/parsec-2.0 =dev-haskell/text-0.11.1.5 =dev-haskell/vector-0.7 =dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/dbus-core/0.9.2.1/dbus-core-0.9.2.1.tar.gz
+
+https://john-millikin.com/software/dbus-core/
+GPL-3
+Low-level D-Bus protocol implementation
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/libxml-sax-0.7.2 b/metadata/cache/dev-haskell/libxml-sax-0.7.2
new file mode 100644
index 000000000000..32ffa15b9130
--- /dev/null
+++ b/metadata/cache/dev-haskell/libxml-sax-0.7.2
@@ -0,0 +1,22 @@
+=dev-lang/ghc-6.10.1 dev-libs/libxml2 dev-haskell/c2hs >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-lang/ghc-6.10.1 dev-libs/libxml2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/libxml-sax/0.7.2/libxml-sax-0.7.2.tar.gz
+
+http://john-millikin.com/software/bindings/libxml-sax/
+MIT
+Bindings for the libXML2 SAX interface
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/pcap-0.4.5.1 b/metadata/cache/dev-haskell/pcap-0.4.5.1
new file mode 100644
index 000000000000..cb4b06eafb11
--- /dev/null
+++ b/metadata/cache/dev-haskell/pcap-0.4.5.1
@@ -0,0 +1,22 @@
+dev-haskell/network dev-haskell/time >=dev-lang/ghc-6.8.2 net-libs/libpcap >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/network dev-haskell/time >=dev-lang/ghc-6.8.2 net-libs/libpcap dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/pcap/0.4.5.1/pcap-0.4.5.1.tar.gz
+
+http://bitbucket.org/bos/pcap
+BSD
+A system-independent interface for user-level packet capture
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/primitive-0.4.1 b/metadata/cache/dev-haskell/primitive-0.4.1
new file mode 100644
index 000000000000..9a48bd6364cb
--- /dev/null
+++ b/metadata/cache/dev-haskell/primitive-0.4.1
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/primitive/0.4.1/primitive-0.4.1.tar.gz
+
+http://code.haskell.org/primitive
+BSD
+Wrappers for primitive operations
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/text-0.11.1.12 b/metadata/cache/dev-haskell/text-0.11.1.12
new file mode 100644
index 000000000000..0bb53a47679a
--- /dev/null
+++ b/metadata/cache/dev-haskell/text-0.11.1.12
@@ -0,0 +1,22 @@
+>=dev-haskell/deepseq-1.1.0.0 >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4.0.1 =dev-haskell/cabal-1.1.4
+>=dev-haskell/deepseq-1.1.0.0 >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/text/0.11.1.12/text-0.11.1.12.tar.gz
+
+https://github.com/bos/text
+BSD
+An efficient packed Unicode text type.
+~amd64 ~x86 ~x86-fbsd ~x86-macos
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+test doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/vector-0.9.1 b/metadata/cache/dev-haskell/vector-0.9.1
new file mode 100644
index 000000000000..b43903066684
--- /dev/null
+++ b/metadata/cache/dev-haskell/vector-0.9.1
@@ -0,0 +1,22 @@
+=dev-haskell/primitive-0.4* >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/primitive-0.4* >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/vector/0.9.1/vector-0.9.1.tar.gz
+
+http://code.haskell.org/vector
+BSD
+Efficient Arrays
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/xml-types-0.3 b/metadata/cache/dev-haskell/xml-types-0.3
new file mode 100644
index 000000000000..7026087334f0
--- /dev/null
+++ b/metadata/cache/dev-haskell/xml-types-0.3
@@ -0,0 +1,22 @@
+dev-haskell/text >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/text >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/xml-types/0.3/xml-types-0.3.tar.gz
+
+http://hackage.haskell.org/package/xml-types
+MIT
+Basic types for representing XML
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jffi-1.0.11 b/metadata/cache/dev-java/jffi-1.0.11
new file mode 100644
index 000000000000..8fecf7363650
--- /dev/null
+++ b/metadata/cache/dev-java/jffi-1.0.11
@@ -0,0 +1,22 @@
+virtual/libffi >=virtual/jdk-1.5 dev-util/pkgconfig test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+1.0
+https://github.com/jnr/jffi/tarball/1.0.11 -> jffi-1.0.11.tar.gz
+
+http://github.com/jnr
+|| ( Apache-2.0 LGPL-3 )
+An optimized Java interface to libffi
+~amd64 ~ppc ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-constants-0.8.2 b/metadata/cache/dev-java/jnr-constants-0.8.2
new file mode 100644
index 000000000000..8fbf8ea3275a
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-constants-0.8.2
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+http://github.com/jnr/jnr-constants/tarball/0.8.2 -> jnr-constants-0.8.2.tar.gz
+
+http://github.com/jnr
+|| ( Apache-2.0 LGPL-3 )
+A set of platform constants (e.g. errno values)
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-ffi-0.5.10 b/metadata/cache/dev-java/jnr-ffi-0.5.10
new file mode 100644
index 000000000000..8c8614028fbd
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-ffi-0.5.10
@@ -0,0 +1,22 @@
+dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0.5
+http://github.com/jnr/jnr-ffi/tarball/0.5.10 -> jnr-ffi-0.5.10.tar.gz
+
+http://github.com/jnr
+|| ( Apache-2.0 LGPL-3 )
+An abstracted interface to invoking native functions from java
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-ffi-0.6.0 b/metadata/cache/dev-java/jnr-ffi-0.6.0
new file mode 100644
index 000000000000..0e5ab17eabf1
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-ffi-0.6.0
@@ -0,0 +1,22 @@
+dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0.6
+http://github.com/jnr/jnr-ffi/tarball/0.6.0 -> jnr-ffi-0.6.0.tar.gz
+test
+http://github.com/jnr
+|| ( Apache-2.0 LGPL-3 )
+An abstracted interface to invoking native functions from java
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-posix-1.1.8 b/metadata/cache/dev-java/jnr-posix-1.1.8
new file mode 100644
index 000000000000..4f9288a097e7
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-posix-1.1.8
@@ -0,0 +1,22 @@
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.5 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.5 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+1.1
+http://github.com/jnr/jnr-posix/tarball/1.1.8 -> jnr-posix-1.1.8.tar.gz
+
+http://github.com/jnr/
+|| ( CPL-1.0 GPL-2 LGPL-2.1 )
+Lightweight cross-platform POSIX emulation layer for Java
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-posix-2.0.0 b/metadata/cache/dev-java/jnr-posix-2.0.0
new file mode 100644
index 000000000000..e818ea2c1480
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-posix-2.0.0
@@ -0,0 +1,22 @@
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.6 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.6 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+2.0
+http://github.com/jnr/jnr-posix/tarball/2.0.0 -> jnr-posix-2.0.0.tar.gz
+
+http://github.com/jnr/
+|| ( CPL-1.0 GPL-2 LGPL-2.1 )
+Lightweight cross-platform POSIX emulation layer for Java
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-x86asm-1.0.1 b/metadata/cache/dev-java/jnr-x86asm-1.0.1
new file mode 100644
index 000000000000..c63007749049
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-x86asm-1.0.1
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+1.0
+http://github.com/jnr/jnr-x86asm/tarball/1.0.1 -> jnr-x86asm-1.0.1.tar.gz
+
+http://github.com/jnr
+MIT
+A pure-java port of asmjit.
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/php-5.3.9 b/metadata/cache/dev-lang/php-5.3.9
index bad57a53dd12..f4248fe21aed 100644
--- a/metadata/cache/dev-lang/php-5.3.9
+++ b/metadata/cache/dev-lang/php-5.3.9
@@ -6,7 +6,7 @@ http://www.php.net/distributions/php-5.3.9.tar.bz2 http://olemarkus.org/~olemark
http://php.net/
PHP-3
The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1 b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1
new file mode 100644
index 000000000000..1d53869be2fe
--- /dev/null
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1
@@ -0,0 +1,22 @@
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+2
+ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
+
+http://cyrusimap.web.cmu.edu/
+as-is
+The Cyrus SASL (Simple Authentication and Security Layer).
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools db-use eutils flag-o-matic java-pkg-opt-2 java-utils-2 libtool multilib pam portability toolchain-funcs user versionator
+authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
+
+
+
+4
+
+compile configure install postinst preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/grantlee-0.1.9 b/metadata/cache/dev-libs/grantlee-0.1.9
new file mode 100644
index 000000000000..e698f7073077
--- /dev/null
+++ b/metadata/cache/dev-libs/grantlee-0.1.9
@@ -0,0 +1,22 @@
+>=x11-libs/qt-core-4.5.0:4 >=x11-libs/qt-gui-4.5.0:4 >=x11-libs/qt-script-4.5.0:4 doc? ( app-doc/doxygen[-nodot] ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=x11-libs/qt-core-4.5.0:4 >=x11-libs/qt-gui-4.5.0:4 >=x11-libs/qt-script-4.5.0:4
+0
+http://www.loegria.net/grantlee/grantlee-0.1.9.tar.gz
+test
+http://www.gitorious.org/grantlee/pages/Home
+LGPL-2.1
+C++ string template engine based on the Django template system
+~amd64 ~arm ~ppc ~ppc64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+debug doc test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libgeier-0.13 b/metadata/cache/dev-libs/libgeier-0.13
new file mode 100644
index 000000000000..9d1def5e324a
--- /dev/null
+++ b/metadata/cache/dev-libs/libgeier-0.13
@@ -0,0 +1,22 @@
+dev-libs/libxml2 dev-libs/libxslt >=dev-libs/xmlsec-1.2.16 dev-libs/nspr dev-libs/nss sys-libs/zlib dev-lang/swig
+dev-libs/libxml2 dev-libs/libxslt >=dev-libs/xmlsec-1.2.16 dev-libs/nspr dev-libs/nss sys-libs/zlib
+0
+http://www.taxbird.de/download/libgeier/0.13/libgeier-0.13.tar.gz
+
+http://www.taxbird.de/
+GPL-2
+Libgeier provides a library to access the german digital tax project ELSTER.
+~amd64 ~x86
+
+
+
+
+
+2
+
+install
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libxml2-2.7.8-r4 b/metadata/cache/dev-libs/libxml2-2.7.8-r4
index dcdb43c82380..b78a90ba8896 100644
--- a/metadata/cache/dev-libs/libxml2-2.7.8-r4
+++ b/metadata/cache/dev-libs/libxml2-2.7.8-r4
@@ -6,7 +6,7 @@ ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz test? ( http://www.w3.org/XML/200
http://www.xmlsoft.org/
MIT
Version 2 of the library to manipulate XML files
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools eutils flag-o-matic libtool multilib portability prefix python toolchain-funcs user
debug doc examples icu ipv6 python readline static-libs test
diff --git a/metadata/cache/dev-libs/nss-3.13.1-r1 b/metadata/cache/dev-libs/nss-3.13.1-r1
index 4ba0a8d0f336..2d213a9f5efb 100644
--- a/metadata/cache/dev-libs/nss-3.13.1-r1
+++ b/metadata/cache/dev-libs/nss-3.13.1-r1
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_1_RTM/src/n
http://www.mozilla.org/projects/security/pki/nss/
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Mozilla's Network Security Services library that implements PKI support
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
eutils flag-o-matic multilib portability toolchain-funcs user
utils
diff --git a/metadata/cache/dev-libs/openssl-0.9.8s-r1 b/metadata/cache/dev-libs/openssl-0.9.8s-r1
index edc24937e40f..dfdc68bc925d 100644
--- a/metadata/cache/dev-libs/openssl-0.9.8s-r1
+++ b/metadata/cache/dev-libs/openssl-0.9.8s-r1
@@ -6,7 +6,7 @@ mirror://openssl/source/openssl-0.9.8s.tar.gz
http://www.openssl.org/
openssl
Toolkit for SSL v2/v3 and TLS v1
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
eutils flag-o-matic multilib portability toolchain-funcs user
bindist gmp kerberos sse2 test zlib
diff --git a/metadata/cache/dev-libs/openssl-1.0.0f-r1 b/metadata/cache/dev-libs/openssl-1.0.0f-r1
index 0f343a968bc9..cc2a7bc31e9c 100644
--- a/metadata/cache/dev-libs/openssl-1.0.0f-r1
+++ b/metadata/cache/dev-libs/openssl-1.0.0f-r1
@@ -6,7 +6,7 @@ mirror://openssl/source/openssl-1.0.0f.tar.gz http://cvs.pld-linux.org/cgi-bin/c
http://www.openssl.org/
openssl
full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
eutils flag-o-matic multilib portability toolchain-funcs user
bindist gmp kerberos rfc3779 sse2 static-libs test zlib
diff --git a/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1 b/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
index 5ebc2d15230d..1d9c3eae4a8a 100644
--- a/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
+++ b/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
php? ( || ( =dev-libs/ossp-uuid-1.6.2-r1[php_targets_php5-3] =dev-libs/ossp-uuid-1.6.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) )
0
ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
diff --git a/metadata/cache/dev-libs/soprano-2.7.4 b/metadata/cache/dev-libs/soprano-2.7.4
new file mode 100644
index 000000000000..da68c188455e
--- /dev/null
+++ b/metadata/cache/dev-libs/soprano-2.7.4
@@ -0,0 +1,22 @@
+>=x11-libs/qt-core-4.5.0:4 clucene? ( dev-cpp/clucene ) dbus? ( >=x11-libs/qt-dbus-4.5.0:4 ) raptor? ( >=media-libs/raptor-2.0.4:2 ) redland? ( >=dev-libs/rasqal-0.9.26 >=dev-libs/redland-1.0.14 ) virtuoso? ( dev-db/libiodbc:0 ) doc? ( app-doc/doxygen ) test? ( >=x11-libs/qt-test-4.5.0:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=x11-libs/qt-core-4.5.0:4 clucene? ( dev-cpp/clucene ) dbus? ( >=x11-libs/qt-dbus-4.5.0:4 ) raptor? ( >=media-libs/raptor-2.0.4:2 ) redland? ( >=dev-libs/rasqal-0.9.26 >=dev-libs/redland-1.0.14 ) virtuoso? ( dev-db/libiodbc:0 ) virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
+0
+mirror://sourceforge/soprano/soprano-2.7.4.tar.bz2
+test
+http://sourceforge.net/projects/soprano
+LGPL-2
+Library that provides a nice Qt interface to RDF storage solutions
+~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/xapian-bindings-1.2.7-r2 b/metadata/cache/dev-libs/xapian-bindings-1.2.7-r2
index 4937e09566e7..38c3b8e5fbaf 100644
--- a/metadata/cache/dev-libs/xapian-bindings-1.2.7-r2
+++ b/metadata/cache/dev-libs/xapian-bindings-1.2.7-r2
@@ -1,4 +1,4 @@
-=dev-libs/xapian-1.2.7* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+=dev-libs/xapian-1.2.7* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
=dev-libs/xapian-1.2.7* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.7-r2[php_targets_php5-3] =dev-libs/xapian-bindings-1.2.7-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
0
http://oligarchy.co.uk/xapian/1.2.7/xapian-bindings-1.2.7.tar.gz
diff --git a/metadata/cache/dev-libs/xapian-bindings-1.2.8 b/metadata/cache/dev-libs/xapian-bindings-1.2.8
index 59725f24fbeb..7de380b97d4d 100644
--- a/metadata/cache/dev-libs/xapian-bindings-1.2.8
+++ b/metadata/cache/dev-libs/xapian-bindings-1.2.8
@@ -1,4 +1,4 @@
-=dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+=dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
=dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.8[php_targets_php5-3] =dev-libs/xapian-bindings-1.2.8[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
0
http://oligarchy.co.uk/xapian/1.2.8/xapian-bindings-1.2.8.tar.gz
diff --git a/metadata/cache/dev-libs/zthread-2.3.2-r2 b/metadata/cache/dev-libs/zthread-2.3.2-r2
new file mode 100644
index 000000000000..b07e690a5ab8
--- /dev/null
+++ b/metadata/cache/dev-libs/zthread-2.3.2-r2
@@ -0,0 +1,22 @@
+doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+
+0
+mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
+
+http://zthread.sourceforge.net/
+MIT
+platform-independent multi-threading and synchronization library for C++
+~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+autotools eutils libtool multilib portability toolchain-funcs user
+debug doc kernel_linux static-libs
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-php/adodb-ext-504-r2 b/metadata/cache/dev-php/adodb-ext-504-r2
index c161bfd36e69..5fd6a6008c02 100644
--- a/metadata/cache/dev-php/adodb-ext-504-r2
+++ b/metadata/cache/dev-php/adodb-ext-504-r2
@@ -1,4 +1,4 @@
->=dev-php/adodb-4.70 app-arch/unzip || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-php/adodb-4.70 app-arch/unzip || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-php/adodb-4.70 || ( =dev-php/adodb-ext-504-r2[php_targets_php5-3] =dev-php/adodb-ext-504-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://phplens.com/lens/dl/adodb-ext-504.zip
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
index 15c74f42e53e..c40c9f9216b7 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r1[php_targets_php5-3] =dev-php/eaccelerator-0.9.6.1-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
index 8b75f9ca26fb..287d953f904d 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r3[php_targets_php5-3] =dev-php/eaccelerator-0.9.6.1-r3[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
index 45ef83a50bd3..7a619bfc999f 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r4[php_targets_php5-3] =dev-php/eaccelerator-0.9.6.1-r4[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1 b/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
index bf8100a23e86..78c02a6bb5f2 100644
--- a/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
+++ b/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
@@ -1,4 +1,4 @@
-virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( =dev-php/ffmpeg-php-0.6.0-r1[php_targets_php5-3] =dev-php/ffmpeg-php-0.6.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
diff --git a/metadata/cache/dev-php/igbinary-1.1.1 b/metadata/cache/dev-php/igbinary-1.1.1
index b4a0bc603427..59ef8adfb652 100644
--- a/metadata/cache/dev-php/igbinary-1.1.1
+++ b/metadata/cache/dev-php/igbinary-1.1.1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/igbinary-1.1.1[php_targets_php5-2] =dev-php/igbinary-1.1.1[php_targets_php5-3] ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
0
http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
diff --git a/metadata/cache/dev-php/igbinary-1.1.1-r1 b/metadata/cache/dev-php/igbinary-1.1.1-r1
index b5e5f87f8576..9849742c440c 100644
--- a/metadata/cache/dev-php/igbinary-1.1.1-r1
+++ b/metadata/cache/dev-php/igbinary-1.1.1-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/igbinary-1.1.1-r1[php_targets_php5-3] =dev-php/igbinary-1.1.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
0
http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-0.4.1 b/metadata/cache/dev-php/libvirt-php-0.4.1
index 485c56e71a37..0ecdacc0af02 100644
--- a/metadata/cache/dev-php/libvirt-php-0.4.1
+++ b/metadata/cache/dev-php/libvirt-php-0.4.1
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.1[php_targets_php5-3] =dev-php/libvirt-php-0.4.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://libvirt.org/sources/php/libvirt-php-0.4.1.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-0.4.2 b/metadata/cache/dev-php/libvirt-php-0.4.2
index 2e9c4a91af9b..68115c539f51 100644
--- a/metadata/cache/dev-php/libvirt-php-0.4.2
+++ b/metadata/cache/dev-php/libvirt-php-0.4.2
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.2[php_targets_php5-3] =dev-php/libvirt-php-0.4.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://libvirt.org/sources/php/libvirt-php-0.4.2.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-9999 b/metadata/cache/dev-php/libvirt-php-9999
index e2fc91565ad7..fa7adb925f91 100644
--- a/metadata/cache/dev-php/libvirt-php-9999
+++ b/metadata/cache/dev-php/libvirt-php-9999
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) dev-vcs/git
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 dev-vcs/git
app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-9999[php_targets_php5-3] =dev-php/libvirt-php-9999[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
diff --git a/metadata/cache/dev-php/magickwand-1.0.8-r1 b/metadata/cache/dev-php/magickwand-1.0.8-r1
index 93472e2d6b86..cecf7c53cf0e 100644
--- a/metadata/cache/dev-php/magickwand-1.0.8-r1
+++ b/metadata/cache/dev-php/magickwand-1.0.8-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.5.2.9 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=media-gfx/imagemagick-6.5.2.9 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=media-gfx/imagemagick-6.5.2.9 || ( =dev-php/magickwand-1.0.8-r1[php_targets_php5-3] =dev-php/magickwand-1.0.8-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://www.magickwand.org/download/php/MagickWandForPHP-1.0.8.tar.bz2
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.7 b/metadata/cache/dev-php/pecl-apc-3.1.7
index 6336840b6e44..182fb384d2e2 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.7
+++ b/metadata/cache/dev-php/pecl-apc-3.1.7
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.7[php_targets_php5-3] =dev-php/pecl-apc-3.1.7[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/APC-3.1.7.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9 b/metadata/cache/dev-php/pecl-apc-3.1.9
index 3bc6a4dfa564..b2f13518ac05 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9[php_targets_php5-3] =dev-php/pecl-apc-3.1.9[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9-r1 b/metadata/cache/dev-php/pecl-apc-3.1.9-r1
index c0ef5f352d20..b8c9b7fddb29 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9-r1
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9-r1
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9-r1[php_targets_php5-3] =dev-php/pecl-apc-3.1.9-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9-r2 b/metadata/cache/dev-php/pecl-apc-3.1.9-r2
index cfd34238a908..dfa80773df39 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9-r2
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9-r2
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/eaccelerator !dev-php/xcache || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9-r2[php_targets_php5-3] =dev-php/pecl-apc-3.1.9-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-bbcode-1.0.2-r1 b/metadata/cache/dev-php/pecl-bbcode-1.0.2-r1
index 0962743de94a..e5c332dc43f8 100644
--- a/metadata/cache/dev-php/pecl-bbcode-1.0.2-r1
+++ b/metadata/cache/dev-php/pecl-bbcode-1.0.2-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-bbcode-1.0.2-r1[php_targets_php5-2] ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/bbcode-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1 b/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
index 1f806205d412..9d17b7c15044 100644
--- a/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
+++ b/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-2] =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-3] ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
0
http://pecl.php.net/get/bbcode-1.0.3b1.tgz
diff --git a/metadata/cache/dev-php/pecl-cairo-0.2.0-r1 b/metadata/cache/dev-php/pecl-cairo-0.2.0-r1
index 3898adac86d8..aec9cab7ccb3 100644
--- a/metadata/cache/dev-php/pecl-cairo-0.2.0-r1
+++ b/metadata/cache/dev-php/pecl-cairo-0.2.0-r1
@@ -1,4 +1,4 @@
->=dev-lang/php-5.2 >=x11-libs/cairo-1.4[svg] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-lang/php-5.2 >=x11-libs/cairo-1.4[svg] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-lang/php-5.2 >=x11-libs/cairo-1.4[svg] || ( =dev-php/pecl-cairo-0.2.0-r1[php_targets_php5-3] =dev-php/pecl-cairo-0.2.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/cairo-0.2.0.tgz
diff --git a/metadata/cache/dev-php/pecl-crack-0.4-r1 b/metadata/cache/dev-php/pecl-crack-0.4-r1
index 22ca2ab3bfdc..9acb33cd26aa 100644
--- a/metadata/cache/dev-php/pecl-crack-0.4-r1
+++ b/metadata/cache/dev-php/pecl-crack-0.4-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-crack-0.4-r1[php_targets_php5-3] =dev-php/pecl-crack-0.4-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/crack-0.4.tgz
diff --git a/metadata/cache/dev-php/pecl-dbx-1.1.0-r1 b/metadata/cache/dev-php/pecl-dbx-1.1.0-r1
index 17ed95cd656b..676db5e145e4 100644
--- a/metadata/cache/dev-php/pecl-dbx-1.1.0-r1
+++ b/metadata/cache/dev-php/pecl-dbx-1.1.0-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-dbx-1.1.0-r1[php_targets_php5-2] ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/dbx-1.1.0.tgz
diff --git a/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2 b/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
index d081a23c1735..aba97f5a1849 100644
--- a/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
+++ b/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-dio-0.0.4_rc4-r2[php_targets_php5-3] =dev-php/pecl-dio-0.0.4_rc4-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/dio-0.0.4rc4.tgz
diff --git a/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1 b/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
index fc11dab8fca7..c5dcf934b64a 100644
--- a/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
+++ b/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
@@ -1,4 +1,4 @@
-dev-db/drizzle || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-db/drizzle || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-db/drizzle || ( =dev-php/pecl-drizzle-0.4.2-r1[php_targets_php5-3] =dev-php/pecl-drizzle-0.4.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/drizzle-0.4.2.tgz
diff --git a/metadata/cache/dev-php/pecl-enchant-1.1.0-r2 b/metadata/cache/dev-php/pecl-enchant-1.1.0-r2
index 928af5d42f28..851079392b86 100644
--- a/metadata/cache/dev-php/pecl-enchant-1.1.0-r2
+++ b/metadata/cache/dev-php/pecl-enchant-1.1.0-r2
@@ -1,4 +1,4 @@
->=app-text/enchant-1.1.3 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=app-text/enchant-1.1.3 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=app-text/enchant-1.1.3 || ( =dev-php/pecl-enchant-1.1.0-r2[php_targets_php5-3] =dev-php/pecl-enchant-1.1.0-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/enchant-1.1.0.tgz
diff --git a/metadata/cache/dev-php/pecl-fileinfo-1.0.4-r2 b/metadata/cache/dev-php/pecl-fileinfo-1.0.4-r2
index 91e9d1b5979e..112cd37703cc 100644
--- a/metadata/cache/dev-php/pecl-fileinfo-1.0.4-r2
+++ b/metadata/cache/dev-php/pecl-fileinfo-1.0.4-r2
@@ -1,4 +1,4 @@
-sys-apps/file || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-apps/file || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-apps/file || ( =dev-php/pecl-fileinfo-1.0.4-r2[php_targets_php5-2] ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/Fileinfo-1.0.4.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-0.7.0-r1 b/metadata/cache/dev-php/pecl-gearman-0.7.0-r1
index ee044a7a1b04..9390d2b14d86 100644
--- a/metadata/cache/dev-php/pecl-gearman-0.7.0-r1
+++ b/metadata/cache/dev-php/pecl-gearman-0.7.0-r1
@@ -1,4 +1,4 @@
-sys-cluster/gearmand || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-cluster/gearmand || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-cluster/gearmand || ( =dev-php/pecl-gearman-0.7.0-r1[php_targets_php5-3] =dev-php/pecl-gearman-0.7.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/gearman-0.7.0.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-0.8.0 b/metadata/cache/dev-php/pecl-gearman-0.8.0
index 516cc344e1ac..8e9edf2f32ad 100644
--- a/metadata/cache/dev-php/pecl-gearman-0.8.0
+++ b/metadata/cache/dev-php/pecl-gearman-0.8.0
@@ -1,4 +1,4 @@
-sys-cluster/gearmand || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-cluster/gearmand || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-cluster/gearmand || ( =dev-php/pecl-gearman-0.8.0[php_targets_php5-3] =dev-php/pecl-gearman-0.8.0[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/gearman-0.8.0.tgz
diff --git a/metadata/cache/dev-php/pecl-geoip-1.0.7-r1 b/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
index 7403531782f2..90a2b4e840e0 100644
--- a/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
+++ b/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/geoip-1.4.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-libs/geoip-1.4.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.7-r1[php_targets_php5-3] =dev-php/pecl-geoip-1.0.7-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/geoip-1.0.7.tgz
diff --git a/metadata/cache/dev-php/pecl-geoip-1.0.8 b/metadata/cache/dev-php/pecl-geoip-1.0.8
index f3c23435ba5a..8e03d0c7f577 100644
--- a/metadata/cache/dev-php/pecl-geoip-1.0.8
+++ b/metadata/cache/dev-php/pecl-geoip-1.0.8
@@ -1,4 +1,4 @@
->=dev-libs/geoip-1.4.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-libs/geoip-1.4.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.8[php_targets_php5-3] =dev-php/pecl-geoip-1.0.8[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/geoip-1.0.8.tgz
diff --git a/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1 b/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
index c5194e8b4d5a..116f934d095d 100644
--- a/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
+++ b/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
@@ -1,4 +1,4 @@
-app-crypt/gpgme || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+app-crypt/gpgme || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
app-crypt/gpgme || ( =dev-php/pecl-gnupg-1.3.2-r1[php_targets_php5-3] =dev-php/pecl-gnupg-1.3.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/gnupg-1.3.2.tgz
diff --git a/metadata/cache/dev-php/pecl-haru-1.0.0-r1 b/metadata/cache/dev-php/pecl-haru-1.0.0-r1
index 41e0f9c95bbf..66cc3f5a8420 100644
--- a/metadata/cache/dev-php/pecl-haru-1.0.0-r1
+++ b/metadata/cache/dev-php/pecl-haru-1.0.0-r1
@@ -1,4 +1,4 @@
-media-libs/libharu[png?,zlib?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+media-libs/libharu[png?,zlib?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
media-libs/libharu[png?,zlib?] || ( =dev-php/pecl-haru-1.0.0-r1[php_targets_php5-3] =dev-php/pecl-haru-1.0.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/haru-1.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-htscanner-0.9.0-r1 b/metadata/cache/dev-php/pecl-htscanner-0.9.0-r1
index dedc13b39236..fac9aa0f7ef2 100644
--- a/metadata/cache/dev-php/pecl-htscanner-0.9.0-r1
+++ b/metadata/cache/dev-php/pecl-htscanner-0.9.0-r1
@@ -1,4 +1,4 @@
-dev-lang/php[cgi] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[cgi] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-0.9.0-r1[php_targets_php5-2] ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/htscanner-0.9.0.tgz
diff --git a/metadata/cache/dev-php/pecl-htscanner-1.0.0 b/metadata/cache/dev-php/pecl-htscanner-1.0.0
index 06366c175f9a..c94006f0c76d 100644
--- a/metadata/cache/dev-php/pecl-htscanner-1.0.0
+++ b/metadata/cache/dev-php/pecl-htscanner-1.0.0
@@ -1,4 +1,4 @@
-dev-lang/php[cgi] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[cgi] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-1.0.0[php_targets_php5-3] =dev-php/pecl-htscanner-1.0.0[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/htscanner-1.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.0-r1 b/metadata/cache/dev-php/pecl-http-1.7.0-r1
index 1d7190e05f1b..192c016be9a6 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.0-r1
+++ b/metadata/cache/dev-php/pecl-http-1.7.0-r1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-2] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/pecl_http-1.7.0.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.1 b/metadata/cache/dev-php/pecl-http-1.7.1
index d49f18bef481..6e41fb8002c0 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.1
+++ b/metadata/cache/dev-php/pecl-http-1.7.1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( =dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] =dev-php/pecl-http-1.7.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] =dev-php/pecl-http-1.7.1[php_targets_php5-2] =dev-php/pecl-http-1.7.1[php_targets_php5-3] =dev-php/pecl-http-1.7.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/pecl_http-1.7.1.tgz
diff --git a/metadata/cache/dev-php/pecl-id3-0.2-r2 b/metadata/cache/dev-php/pecl-id3-0.2-r2
index 359119c5010e..87fc2e67c012 100644
--- a/metadata/cache/dev-php/pecl-id3-0.2-r2
+++ b/metadata/cache/dev-php/pecl-id3-0.2-r2
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-id3-0.2-r2[php_targets_php5-3] =dev-php/pecl-id3-0.2-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/id3-0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-idn-0.2.0-r1 b/metadata/cache/dev-php/pecl-idn-0.2.0-r1
index f3c22c39f3b5..649d63308928 100644
--- a/metadata/cache/dev-php/pecl-idn-0.2.0-r1
+++ b/metadata/cache/dev-php/pecl-idn-0.2.0-r1
@@ -1,4 +1,4 @@
-net-dns/libidn || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+net-dns/libidn || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
net-dns/libidn || ( =dev-php/pecl-idn-0.2.0-r1[php_targets_php5-3] =dev-php/pecl-idn-0.2.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/idn-0.2.0.tgz
diff --git a/metadata/cache/dev-php/pecl-imagick-3.0.0-r1 b/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
index f05c47a9f8b9..e18854bbf51c 100644
--- a/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
+++ b/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.2.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=media-gfx/imagemagick-6.2.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.0-r1[php_targets_php5-3] =dev-php/pecl-imagick-3.0.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/imagick-3.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-imagick-3.0.1-r1 b/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
index 018e6fe352e7..b973562d6e71 100644
--- a/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
+++ b/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.2.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=media-gfx/imagemagick-6.2.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.1-r1[php_targets_php5-3] =dev-php/pecl-imagick-3.0.1-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/imagick-3.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-lzf-1.5.2-r1 b/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
index 35133efddd46..f2b1f12d9025 100644
--- a/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
+++ b/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-lzf-1.5.2-r1[php_targets_php5-3] =dev-php/pecl-lzf-1.5.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/LZF-1.5.2.tgz
diff --git a/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1 b/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
index d9668df0e992..b2a1f266f4eb 100644
--- a/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
+++ b/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
@@ -1,4 +1,4 @@
-dev-lang/php[unicode] dev-util/re2c || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[unicode] dev-util/re2c || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.5-r1[php_targets_php5-3] =dev-php/pecl-mailparse-2.1.5-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mailparse-2.1.5.tgz
diff --git a/metadata/cache/dev-php/pecl-mcve-7.0.3-r1 b/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
index ce197fee6555..71e18611ee4e 100644
--- a/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
+++ b/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl net-libs/libmonetra || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-libs/openssl net-libs/libmonetra || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-libs/openssl net-libs/libmonetra dev-lang/php[ssl] || ( =dev-php/pecl-mcve-7.0.3-r1[php_targets_php5-3] =dev-php/pecl-mcve-7.0.3-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mcve-7.0.3.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-2.2.6-r1 b/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
index 5ac627676b85..d177481b03ba 100644
--- a/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
+++ b/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-2.2.6-r1[php_targets_php5-3] =dev-php/pecl-memcache-2.2.6-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/memcache-2.2.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.5-r1 b/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
index 2e2157e1951c..0feedc5ea4ac 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r1[php_targets_php5-3] =dev-php/pecl-memcache-3.0.5-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/memcache-3.0.5.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.5-r2 b/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
index 287eabf71246..266a0ec58e79 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r2[php_targets_php5-3] =dev-php/pecl-memcache-3.0.5-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/memcache-3.0.5.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.6 b/metadata/cache/dev-php/pecl-memcache-3.0.6
index 25db3b01c194..c05675764600 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.6
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.6
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6[php_targets_php5-3] =dev-php/pecl-memcache-3.0.6[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/memcache-3.0.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.6-r1 b/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
index 0dfe01055079..964a441b6020 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6-r1[php_targets_php5-3] =dev-php/pecl-memcache-3.0.6-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
0
http://pecl.php.net/get/memcache-3.0.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcached-1.0.2-r1 b/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
index 5fe32b06387d..834601d73d47 100644
--- a/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
+++ b/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcached-1.0.2-r1[php_targets_php5-2] =dev-php/pecl-memcached-1.0.2-r1[php_targets_php5-3] ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
0
http://pecl.php.net/get/memcached-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-memcached-2.0.0_beta2 b/metadata/cache/dev-php/pecl-memcached-2.0.0_beta2
index b0e8ab2db165..c8a2bfda3780 100644
--- a/metadata/cache/dev-php/pecl-memcached-2.0.0_beta2
+++ b/metadata/cache/dev-php/pecl-memcached-2.0.0_beta2
@@ -1,4 +1,4 @@
->=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-3?,php_targets_php5-2?] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-3?,php_targets_php5-2?] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-3?,php_targets_php5-2?] ) || ( =dev-php/pecl-memcached-2.0.0_beta2[php_targets_php5-2] =dev-php/pecl-memcached-2.0.0_beta2[php_targets_php5-3] ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
0
http://pecl.php.net/get/memcached-2.0.0b2.tgz
diff --git a/metadata/cache/dev-php/pecl-mogilefs-0.8.1 b/metadata/cache/dev-php/pecl-mogilefs-0.8.1
index 0d7f2ad04778..aaed53008913 100644
--- a/metadata/cache/dev-php/pecl-mogilefs-0.8.1
+++ b/metadata/cache/dev-php/pecl-mogilefs-0.8.1
@@ -1,4 +1,4 @@
-net-libs/neon || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+net-libs/neon || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
net-libs/neon || ( =dev-php/pecl-mogilefs-0.8.1[php_targets_php5-2] =dev-php/pecl-mogilefs-0.8.1[php_targets_php5-3] ) php_targets_php5-2? ( dev-lang/php:5.2 ) php_targets_php5-3? ( dev-lang/php:5.3 )
0
http://pecl.php.net/get/mogilefs-0.8.1.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.1.3 b/metadata/cache/dev-php/pecl-mongo-1.1.3
index 21690d20c49c..6245ee125218 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.1.3
+++ b/metadata/cache/dev-php/pecl-mongo-1.1.3
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-mongo-1.1.3[php_targets_php5-3] =dev-php/pecl-mongo-1.1.3[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mongo-1.1.3.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.1.4 b/metadata/cache/dev-php/pecl-mongo-1.1.4
index 323b8119d019..d85e72ea251d 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.1.4
+++ b/metadata/cache/dev-php/pecl-mongo-1.1.4
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-mongo-1.1.4[php_targets_php5-3] =dev-php/pecl-mongo-1.1.4[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mongo-1.1.4.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.2.0 b/metadata/cache/dev-php/pecl-mongo-1.2.0
index 4cad9df8930a..b001b7975f30 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.2.0
+++ b/metadata/cache/dev-php/pecl-mongo-1.2.0
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-mongo-1.2.0[php_targets_php5-3] =dev-php/pecl-mongo-1.2.0[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mongo-1.2.0.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.2.4 b/metadata/cache/dev-php/pecl-mongo-1.2.4
index 8da50cd3f12d..4f73a91bb1eb 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.2.4
+++ b/metadata/cache/dev-php/pecl-mongo-1.2.4
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-mongo-1.2.4[php_targets_php5-3] =dev-php/pecl-mongo-1.2.4[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mongo-1.2.4.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.2.7 b/metadata/cache/dev-php/pecl-mongo-1.2.7
index 3e5a2c98561c..4c38ab827ae2 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.2.7
+++ b/metadata/cache/dev-php/pecl-mongo-1.2.7
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-mongo-1.2.7[php_targets_php5-3] =dev-php/pecl-mongo-1.2.7[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
0
http://pecl.php.net/get/mongo-1.2.7.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1 b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
index a1e24c1fddd1..cf0d7921d6fc 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
+++ b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.1[php_targets_php5-3] =dev-php/pecl-mysqlnd_ms-1.1.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mysqlnd_ms-1.1.1.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2 b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
index 87705efaa644..47df1c931278 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
+++ b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.2[php_targets_php5-3] =dev-php/pecl-mysqlnd_ms-1.1.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mysqlnd_ms-1.1.2.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1 b/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
index 847447ecf7c8..125b7535b73a 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
+++ b/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[mysqlnd] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_qc-1.0.1[php_targets_php5-3] =dev-php/pecl-mysqlnd_qc-1.0.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/mysqlnd_qc-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-oauth-1.2.2 b/metadata/cache/dev-php/pecl-oauth-1.2.2
index 246a67a86e71..88e967876251 100644
--- a/metadata/cache/dev-php/pecl-oauth-1.2.2
+++ b/metadata/cache/dev-php/pecl-oauth-1.2.2
@@ -1,4 +1,4 @@
-dev-lang/php[hash] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[hash] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[hash] || ( =dev-php/pecl-oauth-1.2.2[php_targets_php5-3] =dev-php/pecl-oauth-1.2.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/oauth-1.2.2.tgz
diff --git a/metadata/cache/dev-php/pecl-pam-1.0.2-r1 b/metadata/cache/dev-php/pecl-pam-1.0.2-r1
index 7dddd886bebb..06cbc3c78d6e 100644
--- a/metadata/cache/dev-php/pecl-pam-1.0.2-r1
+++ b/metadata/cache/dev-php/pecl-pam-1.0.2-r1
@@ -1,4 +1,4 @@
-sys-libs/pam || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-libs/pam || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-libs/pam || ( =dev-php/pecl-pam-1.0.2-r1[php_targets_php5-3] =dev-php/pecl-pam-1.0.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/pam-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-ps-1.3.6-r1 b/metadata/cache/dev-php/pecl-ps-1.3.6-r1
index d2104a5a71fb..d396e79d5106 100644
--- a/metadata/cache/dev-php/pecl-ps-1.3.6-r1
+++ b/metadata/cache/dev-php/pecl-ps-1.3.6-r1
@@ -1,4 +1,4 @@
-dev-libs/pslib || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-libs/pslib || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-libs/pslib || ( =dev-php/pecl-ps-1.3.6-r1[php_targets_php5-3] =dev-php/pecl-ps-1.3.6-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/ps-1.3.6.tgz
diff --git a/metadata/cache/dev-php/pecl-radius-1.2.5-r1 b/metadata/cache/dev-php/pecl-radius-1.2.5-r1
index eb2c1ed62cbc..3febd3ce03bc 100644
--- a/metadata/cache/dev-php/pecl-radius-1.2.5-r1
+++ b/metadata/cache/dev-php/pecl-radius-1.2.5-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-radius-1.2.5-r1[php_targets_php5-3] =dev-php/pecl-radius-1.2.5-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/radius-1.2.5.tgz
diff --git a/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2 b/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
index 3b9d8af85461..4188e1ba85eb 100644
--- a/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
+++ b/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
@@ -1,4 +1,4 @@
->=dev-lang/php-5.2[json,soap,xml] || ( =dev-lang/php-5.3.1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-lang/php-5.2[json,soap,xml] || ( =dev-lang/php-5.3.1 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-lang/php-5.2[json,soap,xml] || ( =dev-lang/php-5.3.1 ) || ( =dev-php/pecl-sca_sdo-1.2.4-r2[php_targets_php5-3] =dev-php/pecl-sca_sdo-1.2.4-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/SCA_SDO-1.2.4.tgz
diff --git a/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1 b/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
index 629c3b9fb07e..aa2dd3f4ff51 100644
--- a/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
+++ b/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
@@ -1,4 +1,4 @@
->=net-libs/libssh2-0.18 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=net-libs/libssh2-0.18 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.2-r1[php_targets_php5-3] =dev-php/pecl-ssh2-0.11.2-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/ssh2-0.11.2.tgz
diff --git a/metadata/cache/dev-php/pecl-ssh2-0.11.3 b/metadata/cache/dev-php/pecl-ssh2-0.11.3
index 0d66828e2fbc..46cb4bfd0cb0 100644
--- a/metadata/cache/dev-php/pecl-ssh2-0.11.3
+++ b/metadata/cache/dev-php/pecl-ssh2-0.11.3
@@ -1,4 +1,4 @@
->=net-libs/libssh2-0.18 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=net-libs/libssh2-0.18 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3[php_targets_php5-3] =dev-php/pecl-ssh2-0.11.3[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/ssh2-0.11.3.tgz
diff --git a/metadata/cache/dev-php/pecl-stomp-1.0.3 b/metadata/cache/dev-php/pecl-stomp-1.0.3
index 1297f20c3a5d..e297358e2288 100644
--- a/metadata/cache/dev-php/pecl-stomp-1.0.3
+++ b/metadata/cache/dev-php/pecl-stomp-1.0.3
@@ -1,4 +1,4 @@
-ssl? ( dev-lang/php[ssl] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+ssl? ( dev-lang/php[ssl] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
ssl? ( dev-lang/php[ssl] ) || ( =dev-php/pecl-stomp-1.0.3[php_targets_php5-3] =dev-php/pecl-stomp-1.0.3[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/stomp-1.0.3.tgz
diff --git a/metadata/cache/dev-php/pecl-svn-1.0.0-r1 b/metadata/cache/dev-php/pecl-svn-1.0.0-r1
index ac9e68a4d0d6..c76af84685f4 100644
--- a/metadata/cache/dev-php/pecl-svn-1.0.0-r1
+++ b/metadata/cache/dev-php/pecl-svn-1.0.0-r1
@@ -1,4 +1,4 @@
-dev-vcs/subversion || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-vcs/subversion || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-svn-1.0.0-r1[php_targets_php5-3] =dev-php/pecl-svn-1.0.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/svn-1.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-syck-0.9.3-r1 b/metadata/cache/dev-php/pecl-syck-0.9.3-r1
index 82ff87edbb1d..b8c531494ce3 100644
--- a/metadata/cache/dev-php/pecl-syck-0.9.3-r1
+++ b/metadata/cache/dev-php/pecl-syck-0.9.3-r1
@@ -1,4 +1,4 @@
-dev-libs/syck || ( =dev-lang/php-5.3.1[hash] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-libs/syck || ( =dev-lang/php-5.3.1[hash] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-libs/syck || ( =dev-lang/php-5.3.1[hash] ) || ( =dev-php/pecl-syck-0.9.3-r1[php_targets_php5-3] =dev-php/pecl-syck-0.9.3-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/syck-0.9.3.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1 b/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1
index 2fb440c7a306..a17e2d998a90 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1
+++ b/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2010.15-r1[php_targets_php5-3] =dev-php/pecl-timezonedb-2010.15-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2010.15.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.10 b/metadata/cache/dev-php/pecl-timezonedb-2011.10
index b2e2e00028ca..31f6d0dd5a57 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.10
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.10
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2011.10[php_targets_php5-3] =dev-php/pecl-timezonedb-2011.10[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2011.10.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.13 b/metadata/cache/dev-php/pecl-timezonedb-2011.13
index 61cb64a4949d..9b829038acee 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.13
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.13
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2011.13[php_targets_php5-3] =dev-php/pecl-timezonedb-2011.13[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2011.13.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.3 b/metadata/cache/dev-php/pecl-timezonedb-2011.3
index c7b3a556e7a4..9d8999ac38d3 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.3
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.3
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2011.3[php_targets_php5-3] =dev-php/pecl-timezonedb-2011.3[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2011.3.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.4 b/metadata/cache/dev-php/pecl-timezonedb-2011.4
index f3c6429ef20f..228b4ba03f21 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.4
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.4
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2011.4[php_targets_php5-3] =dev-php/pecl-timezonedb-2011.4[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2011.4.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.7 b/metadata/cache/dev-php/pecl-timezonedb-2011.7
index 61508246aa0f..fd1893a55984 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.7
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.7
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-timezonedb-2011.7[php_targets_php5-3] =dev-php/pecl-timezonedb-2011.7[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/timezonedb-2011.7.tgz
diff --git a/metadata/cache/dev-php/pecl-translit-0.6.0-r1 b/metadata/cache/dev-php/pecl-translit-0.6.0-r1
index 28b3f6096167..aebea2e1b877 100644
--- a/metadata/cache/dev-php/pecl-translit-0.6.0-r1
+++ b/metadata/cache/dev-php/pecl-translit-0.6.0-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-translit-0.6.0-r1[php_targets_php5-3] =dev-php/pecl-translit-0.6.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/translit-0.6.0.tgz
diff --git a/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1 b/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
index 00c33bd87793..499867a591f8 100644
--- a/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
+++ b/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
|| ( =dev-php/pecl-uploadprogress-1.0.1-r1[php_targets_php5-3] =dev-php/pecl-uploadprogress-1.0.1-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/uploadprogress-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-uuid-1.0.2 b/metadata/cache/dev-php/pecl-uuid-1.0.2
index 7425eb16186f..fda87d14dbd5 100644
--- a/metadata/cache/dev-php/pecl-uuid-1.0.2
+++ b/metadata/cache/dev-php/pecl-uuid-1.0.2
@@ -1,4 +1,4 @@
-sys-apps/util-linux || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+sys-apps/util-linux || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
sys-apps/util-linux || ( =dev-php/pecl-uuid-1.0.2[php_targets_php5-3] =dev-php/pecl-uuid-1.0.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/uuid-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1 b/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
index 3adfc5e8948f..bb4279101cd3 100644
--- a/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
+++ b/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
@@ -1,4 +1,4 @@
-dev-libs/libxdiff || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-libs/libxdiff || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-libs/libxdiff || ( =dev-php/pecl-xdiff-1.5.1-r1[php_targets_php5-3] =dev-php/pecl-xdiff-1.5.1-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/xdiff-1.5.1.tgz
diff --git a/metadata/cache/dev-php/pecl-yaml-1.0.1 b/metadata/cache/dev-php/pecl-yaml-1.0.1
index 4d3490e3e8f8..565f44da04e6 100644
--- a/metadata/cache/dev-php/pecl-yaml-1.0.1
+++ b/metadata/cache/dev-php/pecl-yaml-1.0.1
@@ -1,4 +1,4 @@
->=dev-libs/libyaml-0.1.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-libs/libyaml-0.1.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/libyaml-0.1.0 || ( =dev-php/pecl-yaml-1.0.1[php_targets_php5-3] =dev-php/pecl-yaml-1.0.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/yaml-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-yaz-1.0.14-r1 b/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
index 442353b8fca1..e92117481a2b 100644
--- a/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
+++ b/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
@@ -1,4 +1,4 @@
->=dev-libs/yaz-3.0.2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-libs/yaz-3.0.2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.0.14-r1[php_targets_php5-3] =dev-php/pecl-yaz-1.0.14-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/yaz-1.0.14.tgz
diff --git a/metadata/cache/dev-php/pecl-yaz-1.1.1 b/metadata/cache/dev-php/pecl-yaz-1.1.1
index c5c3e165fa0e..e7b0386b3d35 100644
--- a/metadata/cache/dev-php/pecl-yaz-1.1.1
+++ b/metadata/cache/dev-php/pecl-yaz-1.1.1
@@ -1,4 +1,4 @@
->=dev-libs/yaz-3.0.2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+>=dev-libs/yaz-3.0.2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
>=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.1.1[php_targets_php5-3] =dev-php/pecl-yaz-1.1.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/yaz-1.1.1.tgz
diff --git a/metadata/cache/dev-php/php-gtk-2.0.1-r4 b/metadata/cache/dev-php/php-gtk-2.0.1-r4
index ed65b96ed37f..5759ef9007cf 100644
--- a/metadata/cache/dev-php/php-gtk-2.0.1-r4
+++ b/metadata/cache/dev-php/php-gtk-2.0.1-r4
@@ -1,4 +1,4 @@
->=dev-lang/php-5.1.2 =x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8.0 >=dev-libs/atk-1.9.0 glade? ( >=gnome-base/libglade-2.5.0 ) libsexy? ( >=x11-libs/libsexy-0.1.10 ) gtkhtml? ( gnome-extra/gtkhtml:3.14 ) mozembed? ( >=www-client/firefox-1.5.0 ) spell? ( >=app-text/gtkspell-2.0.0:2 ) >=dev-util/pkgconfig-0.9 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-lang/php-5.1.2 =x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8.0 >=dev-libs/atk-1.9.0 glade? ( >=gnome-base/libglade-2.5.0 ) libsexy? ( >=x11-libs/libsexy-0.1.10 ) gtkhtml? ( gnome-extra/gtkhtml:3.14 ) mozembed? ( >=www-client/firefox-1.5.0 ) spell? ( >=app-text/gtkspell-2.0.0:2 ) >=dev-util/pkgconfig-0.9 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
>=dev-lang/php-5.1.2 =x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8.0 >=dev-libs/atk-1.9.0 glade? ( >=gnome-base/libglade-2.5.0 ) libsexy? ( >=x11-libs/libsexy-0.1.10 ) gtkhtml? ( gnome-extra/gtkhtml:3.14 ) mozembed? ( >=www-client/firefox-1.5.0 ) spell? ( >=app-text/gtkspell-2.0.0:2 ) || ( =dev-php/php-gtk-2.0.1-r4[php_targets_php5-2] ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://gtk.php.net/distributions/php-gtk-2.0.1.tar.gz doc? ( linguas_bg? ( http://dev.gentooexperimental.org/~jakub/distfiles/php_gtk_manual-20071130_bg.tar.bz2 mirror://gentoo/php_gtk_manual-20071130_bg.tar.bz2 ) ) doc? ( linguas_en? ( http://dev.gentooexperimental.org/~jakub/distfiles/php_gtk_manual-20071130_en.tar.bz2 mirror://gentoo/php_gtk_manual-20071130_en.tar.bz2 ) ) doc? ( linguas_ja? ( http://dev.gentooexperimental.org/~jakub/distfiles/php_gtk_manual-20071130_ja.tar.bz2 mirror://gentoo/php_gtk_manual-20071130_ja.tar.bz2 ) ) doc? ( linguas_pt_BR? ( http://dev.gentooexperimental.org/~jakub/distfiles/php_gtk_manual-20071130_pt_BR.tar.bz2 mirror://gentoo/php_gtk_manual-20071130_pt_BR.tar.bz2 ) ) doc? ( linguas_zh_CN? ( http://dev.gentooexperimental.org/~jakub/distfiles/php_gtk_manual-20071130_zh_CN.tar.bz2 mirror://gentoo/php_gtk_manual-20071130_zh_CN.tar.bz2 ) )
diff --git a/metadata/cache/dev-php/phpdbg-2.15.5-r1 b/metadata/cache/dev-php/phpdbg-2.15.5-r1
index 76c53ed08d7a..025cfeafa29b 100644
--- a/metadata/cache/dev-php/phpdbg-2.15.5-r1
+++ b/metadata/cache/dev-php/phpdbg-2.15.5-r1
@@ -1,4 +1,4 @@
-=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-2? ( dev-lang/php:5.2 )
+=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+dev-lang/php[unicode] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.32.1-r2[php_targets_php5-3] =dev-php/suhosin-0.9.32.1-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://download.suhosin.org/suhosin-0.9.32.1.tar.gz
diff --git a/metadata/cache/dev-php/xcache-1.3.1 b/metadata/cache/dev-php/xcache-1.3.1
index 2cf4012b14e5..7c6f743d902e 100644
--- a/metadata/cache/dev-php/xcache-1.3.1
+++ b/metadata/cache/dev-php/xcache-1.3.1
@@ -1,4 +1,4 @@
-virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-1.3.1[php_targets_php5-3] =dev-php/xcache-1.3.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://xcache.lighttpd.net/pub/Releases/1.3.1/xcache-1.3.1.tar.bz2
diff --git a/metadata/cache/dev-php/xcache-1.3.2 b/metadata/cache/dev-php/xcache-1.3.2
index c7516fff0471..953906dece93 100644
--- a/metadata/cache/dev-php/xcache-1.3.2
+++ b/metadata/cache/dev-php/xcache-1.3.2
@@ -1,4 +1,4 @@
-virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-1.3.2[php_targets_php5-3] =dev-php/xcache-1.3.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://xcache.lighttpd.net/pub/Releases/1.3.2/xcache-1.3.2.tar.bz2
diff --git a/metadata/cache/dev-php/xdebug-2.1.0-r1 b/metadata/cache/dev-php/xdebug-2.1.0-r1
index f9aa0fa56e8c..bb2c33fae0cd 100644
--- a/metadata/cache/dev-php/xdebug-2.1.0-r1
+++ b/metadata/cache/dev-php/xdebug-2.1.0-r1
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.0 || ( =dev-php/xdebug-2.1.0-r1[php_targets_php5-3] =dev-php/xdebug-2.1.0-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/xdebug-2.1.0.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.1 b/metadata/cache/dev-php/xdebug-2.1.1
index ebb89d11f48b..2574dd37dcff 100644
--- a/metadata/cache/dev-php/xdebug-2.1.1
+++ b/metadata/cache/dev-php/xdebug-2.1.1
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.1 || ( =dev-php/xdebug-2.1.1[php_targets_php5-3] =dev-php/xdebug-2.1.1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/xdebug-2.1.1.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.2 b/metadata/cache/dev-php/xdebug-2.1.2
index dc1999d6b898..bcb01c1bec58 100644
--- a/metadata/cache/dev-php/xdebug-2.1.2
+++ b/metadata/cache/dev-php/xdebug-2.1.2
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+!dev-php/ZendOptimizer || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.2 || ( =dev-php/xdebug-2.1.2[php_targets_php5-3] =dev-php/xdebug-2.1.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/xdebug-2.1.2.tgz
diff --git a/metadata/cache/dev-php/xhprof-0.9.2 b/metadata/cache/dev-php/xhprof-0.9.2
index 106a37797539..11d78d1c1f76 100644
--- a/metadata/cache/dev-php/xhprof-0.9.2
+++ b/metadata/cache/dev-php/xhprof-0.9.2
@@ -1,4 +1,4 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
dev-lang/php || ( =dev-php/xhprof-0.9.2[php_targets_php5-3] =dev-php/xhprof-0.9.2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 )
0
http://pecl.php.net/get/xhprof-0.9.2.tgz
diff --git a/metadata/cache/dev-python/coverage-3.5.1 b/metadata/cache/dev-python/coverage-3.5.1
index 67f9caaa0f7a..75d6cd69fc43 100644
--- a/metadata/cache/dev-python/coverage-3.5.1
+++ b/metadata/cache/dev-python/coverage-3.5.1
@@ -6,7 +6,7 @@ mirror://pypi/c/coverage/coverage-3.5.1.tar.gz
http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage
BSD
Code coverage measurement for Python
-~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
distutils multilib python toolchain-funcs
diff --git a/metadata/cache/dev-python/gntp-0.5 b/metadata/cache/dev-python/gntp-0.5
new file mode 100644
index 000000000000..80434afcb03f
--- /dev/null
+++ b/metadata/cache/dev-python/gntp-0.5
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+https://github.com/kfdm/gntp/tarball/0.5 -> gntp-0.5.tar.gz
+
+https://github.com/kfdm/gntp
+BSD
+Python library for working with the Growl Notification Transport Protocol
+~amd64
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/iobuffer-0.1.3-r1 b/metadata/cache/dev-ruby/iobuffer-0.1.3-r1
deleted file mode 100644
index c33e250e7c05..000000000000
--- a/metadata/cache/dev-ruby/iobuffer-0.1.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-0
-mirror://rubygems/iobuffer-0.1.3.gem
-
-http://mynyml.com/ruby/flexible-continuous-testing
-MIT
-IO::Buffer is a fast byte queue which is primarily intended for non-blocking I/O applications
-~amd64 ~x86 ~x86-macos
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/iobuffer-1.0.0 b/metadata/cache/dev-ruby/iobuffer-1.0.0
index a5a2100fde46..63c3c6a63384 100644
--- a/metadata/cache/dev-ruby/iobuffer-1.0.0
+++ b/metadata/cache/dev-ruby/iobuffer-1.0.0
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
0
mirror://rubygems/iobuffer-1.0.0.gem
@@ -8,7 +8,7 @@ MIT
IO::Buffer is a fast byte queue which is primarily intended for non-blocking I/O applications
~amd64 ~x86 ~x86-macos
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
diff --git a/metadata/cache/dev-ruby/rev-0.3.2 b/metadata/cache/dev-ruby/rev-0.3.2
index 7ae3971ab2d5..80043bd331e9 100644
--- a/metadata/cache/dev-ruby/rev-0.3.2
+++ b/metadata/cache/dev-ruby/rev-0.3.2
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
0
mirror://rubygems/rev-0.3.2.gem
@@ -8,7 +8,7 @@ MIT
Rev is an event library for Ruby, built on the libev event library.
~amd64 ~x86 ~x86-macos
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test
diff --git a/metadata/cache/dev-util/bustle-0.3.1 b/metadata/cache/dev-util/bustle-0.3.1
new file mode 100644
index 000000000000..7a8f40b5e092
--- /dev/null
+++ b/metadata/cache/dev-util/bustle-0.3.1
@@ -0,0 +1,22 @@
+net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0 dev-haskell/binary >=dev-haskell/cabal-1.6 dev-haskell/cairo =dev-haskell/dbus-core-0.9* dev-haskell/glade dev-haskell/glib >dev-haskell/gtk-0.11 dev-haskell/mtl dev-haskell/pango dev-haskell/parsec dev-haskell/pcap dev-haskell/text >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.1.4
+net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
+0
+http://willthompson.co.uk/bustle/releases/bustle-0.3.1.tar.gz
+
+http://hackage.haskell.org/package/bustle
+LGPL-2 GPL-2
+Draw pretty sequence diagrams of D-Bus traffic
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.4 b/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.4
index 5eb4396b52b9..c15bdade680e 100644
--- a/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.4
+++ b/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.4
@@ -6,7 +6,7 @@ http://intgat.tigress.co.uk/rmy/extensions/gnome-shell-frippery-0.3.4.tgz
http://intgat.tigress.co.uk/rmy/extensions/index.html
GPL-2
Unofficial extension pack providing GNOME 2-like features for GNOME 3
-~amd64
+~amd64 ~x86
diff --git a/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.6 b/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.6
index 850c8c9f2c94..c01c2fd6fda4 100644
--- a/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.6
+++ b/metadata/cache/gnome-extra/gnome-shell-frippery-0.3.6
@@ -6,7 +6,7 @@ http://intgat.tigress.co.uk/rmy/extensions/gnome-shell-frippery-0.3.6.tgz
http://intgat.tigress.co.uk/rmy/extensions/index.html
GPL-2
Unofficial extension pack providing GNOME 2-like features for GNOME 3
-~amd64
+~amd64 ~x86
diff --git a/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.6 b/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
similarity index 65%
rename from metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.6
rename to metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
index 76a79ea34fa8..8afa859a88ef 100644
--- a/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.6
+++ b/metadata/cache/kde-misc/plasma-widget-message-indicator-0.5.8
@@ -1,8 +1,8 @@
>=dev-libs/libdbusmenu-qt-0.3.0 >=dev-libs/libindicate-qt-0.2.5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=dev-libs/libdbusmenu-qt-0.3.0 >=dev-libs/libindicate-qt-0.2.5 !kde-misc/plasma-indicatordisplay >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+>=dev-libs/libdbusmenu-qt-0.3.0 >=dev-libs/libindicate-qt-0.2.5 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
4
-http://launchpad.net/plasma-widget-message-indicator/trunk/0.5.6/+download/plasma-widget-message-indicator-0.5.6.tar.bz2
-
+http://launchpad.net/plasma-widget-message-indicator/trunk/0.5.8/+download/plasma-widget-message-indicator-0.5.8.tar.bz2
+test
https://launchpad.net/plasma-widget-message-indicator
GPL-3
Plasmoid for displaying Ayatana indications
diff --git a/metadata/cache/kde-misc/wacomtablet-1.3.6 b/metadata/cache/kde-misc/wacomtablet-1.3.6
new file mode 100644
index 000000000000..aacf5e9180a4
--- /dev/null
+++ b/metadata/cache/kde-misc/wacomtablet-1.3.6
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+>=x11-drivers/xf86-input-wacom-0.11.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.6.tar.bz2
+
+http://kde-apps.org/content/show.php?action=content&content=114856
+GPL-2
+KControl module for wacom tablets
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+debug linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW +handbook aqua kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-client/thunderbird-9.0 b/metadata/cache/mail-client/thunderbird-9.0
index 9ad730c02dd8..3a02bbed355c 100644
--- a/metadata/cache/mail-client/thunderbird-9.0
+++ b/metadata/cache/mail-client/thunderbird-9.0
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/source/thunderbird-9.0.sourc
http://www.mozilla.com/en-US/thunderbird/
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Thunderbird Mail Client
-~alpha amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux
autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils portability python toolchain-funcs user
bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
diff --git a/metadata/cache/mail-client/thunderbird-bin-9.0.1 b/metadata/cache/mail-client/thunderbird-bin-9.0.1
index e03761314230..71880d3ab458 100644
--- a/metadata/cache/mail-client/thunderbird-bin-9.0.1
+++ b/metadata/cache/mail-client/thunderbird-bin-9.0.1
@@ -6,7 +6,7 @@ strip
http://www.mozilla.com/thunderbird
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Thunderbird Mail Client
--* amd64 ~x86
+-* amd64 x86
eutils fdo-mime gnome2-utils mozextension multilib pax-utils portability toolchain-funcs user
+crashreporter linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh
diff --git a/metadata/cache/mail-mta/mini-qmail-1.06 b/metadata/cache/mail-mta/mini-qmail-1.06
index e79feab70c17..dd0e131071ba 100644
--- a/metadata/cache/mail-mta/mini-qmail-1.06
+++ b/metadata/cache/mail-mta/mini-qmail-1.06
@@ -6,7 +6,7 @@ mirror://qmail/netqmail-1.06.tar.gz http://dev.gentoo.org/~hollow/distfiles/genq
http://netqmail.org http://cr.yp.to/qmail/mini.html http://qmail.org
public-domain
a small null client that forwards mail via QMQP to a full qmail server
-~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86
+~amd64 arm ~hppa ~mips ~ppc ~sparc ~x86
eutils fixheadtails flag-o-matic multilib portability qmail toolchain-funcs user
diff --git a/metadata/cache/media-fonts/lohit-fonts-2.4.2 b/metadata/cache/media-fonts/lohit-fonts-2.4.2
index 5be4f23eb27d..bf7514944fb7 100644
--- a/metadata/cache/media-fonts/lohit-fonts-2.4.2
+++ b/metadata/cache/media-fonts/lohit-fonts-2.4.2
@@ -6,7 +6,7 @@ test binchecks
https://fedorahosted.org/lohit
GPL-2
The Lohit family of Indic fonts
-~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
eutils font multilib portability toolchain-funcs user
X
diff --git a/metadata/cache/media-gfx/potrace-1.10-r1 b/metadata/cache/media-gfx/potrace-1.10-r1
index 2be8ac66ee14..39ec535046b2 100644
--- a/metadata/cache/media-gfx/potrace-1.10-r1
+++ b/metadata/cache/media-gfx/potrace-1.10-r1
@@ -6,7 +6,7 @@ http://potrace.sourceforge.net/download/potrace-1.10.tar.gz
http://potrace.sourceforge.net/
GPL-2
Transforming bitmaps into vector graphics
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
metric static-libs
diff --git a/metadata/cache/media-libs/libvisio-0.0.12 b/metadata/cache/media-libs/libvisio-0.0.12
index 27a2498d56bd..d5d9e7315084 100644
--- a/metadata/cache/media-libs/libvisio-0.0.12
+++ b/metadata/cache/media-libs/libvisio-0.0.12
@@ -1,4 +1,4 @@
-dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
+>=dev-libs/boost-1.46 dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
app-text/libwpd:0.9 app-text/libwpg:0.2
0
http://dev-www.libreoffice.org/src/libvisio-0.0.12.tar.xz
diff --git a/metadata/cache/media-libs/libvisio-9999 b/metadata/cache/media-libs/libvisio-9999
index 713fce522104..bc006c243460 100644
--- a/metadata/cache/media-libs/libvisio-9999
+++ b/metadata/cache/media-libs/libvisio-9999
@@ -1,4 +1,4 @@
-dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
+>=dev-libs/boost-1.46 dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
app-text/libwpd:0.9 app-text/libwpg:0.2
0
diff --git a/metadata/cache/media-libs/ming-0.4.3-r1 b/metadata/cache/media-libs/ming-0.4.3-r1
index 9b2be412f012..c2d946987c32 100644
--- a/metadata/cache/media-libs/ming-0.4.3-r1
+++ b/metadata/cache/media-libs/ming-0.4.3-r1
@@ -1,4 +1,4 @@
-sys-devel/flex virtual/yacc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+sys-devel/flex virtual/yacc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype media-libs/libpng media-libs/giflib sys-libs/zlib !media-libs/libswf php? ( || ( =media-libs/ming-0.4.3-r1[php_targets_php5-3] =media-libs/ming-0.4.3-r1[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
0
mirror://sourceforge/ming/ming-0.4.3.tar.bz2
diff --git a/metadata/cache/media-libs/ming-0.4.3-r2 b/metadata/cache/media-libs/ming-0.4.3-r2
index 48dba1e95933..0986cf8afd7f 100644
--- a/metadata/cache/media-libs/ming-0.4.3-r2
+++ b/metadata/cache/media-libs/ming-0.4.3-r2
@@ -1,4 +1,4 @@
-sys-devel/flex virtual/yacc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+sys-devel/flex virtual/yacc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype media-libs/libpng media-libs/giflib sys-libs/zlib !media-libs/libswf php? ( || ( =media-libs/ming-0.4.3-r2[php_targets_php5-3] =media-libs/ming-0.4.3-r2[php_targets_php5-2] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-2? ( dev-lang/php:5.2 ) ) dev-lang/perl[-build] >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
0
mirror://sourceforge/ming/ming-0.4.3.tar.bz2
diff --git a/metadata/cache/media-libs/opencv-2.3.0 b/metadata/cache/media-libs/opencv-2.3.0
index 2392da237b83..0bee0cd124b2 100644
--- a/metadata/cache/media-libs/opencv-2.3.0
+++ b/metadata/cache/media-libs/opencv-2.3.0
@@ -7,7 +7,7 @@ http://opencv.willowgarage.com
BSD
A collection of algorithms and sample code for various computer vision problems
amd64 ppc x86
-base cmake-utils eutils flag-o-matic fortran-2 multilib portability python toolchain-funcs user
+base cmake-utils eutils flag-o-matic multilib portability python toolchain-funcs user
cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine
diff --git a/metadata/cache/media-libs/opengtl-0.9.15.2 b/metadata/cache/media-libs/opengtl-0.9.15.2
new file mode 100644
index 000000000000..ed5d4d591fbc
--- /dev/null
+++ b/metadata/cache/media-libs/opengtl-0.9.15.2
@@ -0,0 +1,22 @@
+media-libs/libpng =dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/libpng =sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+>=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+http://www.kde-apps.org/CONTENT/content-files/117669-k4guitune-1.1.1.tar.gz
+
+http://wspinell.altervista.org/k4guitune/ http://www.kde-apps.org/content/show.php/K4Guitune?content=117669
+GPL-3
+A program to tune a musical instrument using your computer and it's mic- or line- input
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+debug +handbook aqua kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/mpc-0.21 b/metadata/cache/media-sound/mpc-0.21
index 94da744415cb..2ec2165cd242 100644
--- a/metadata/cache/media-sound/mpc-0.21
+++ b/metadata/cache/media-sound/mpc-0.21
@@ -6,7 +6,7 @@ mirror://sourceforge/musicpd/mpc-0.21.tar.bz2
http://www.musicpd.org
GPL-2
A commandline client for Music Player Daemon (media-sound/mpd)
-amd64 ~arm ~hppa ppc ppc64 sparc ~x86
+amd64 arm ~hppa ppc ppc64 sparc ~x86
bash-completion-r1
iconv
diff --git a/metadata/cache/media-sound/pianobar-9999 b/metadata/cache/media-sound/pianobar-9999
new file mode 100644
index 000000000000..66f2a9b59e4d
--- /dev/null
+++ b/metadata/cache/media-sound/pianobar-9999
@@ -0,0 +1,22 @@
+media-libs/libao net-libs/gnutls aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad ) dev-vcs/git
+media-libs/libao net-libs/gnutls aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad )
+0
+
+test
+http://6xq.net/projects/pianobar/
+as-is
+A console-based replacement for Pandora's flash player
+
+eutils flag-o-matic git-2 multilib portability toolchain-funcs user
+aac +mp3
+|| ( mp3 aac )
+
+
+4
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/gnu-netcat-0.7.1-r3 b/metadata/cache/net-analyzer/gnu-netcat-0.7.1-r3
index fd6ac297051a..91abd8eec8b8 100644
--- a/metadata/cache/net-analyzer/gnu-netcat-0.7.1-r3
+++ b/metadata/cache/net-analyzer/gnu-netcat-0.7.1-r3
@@ -6,7 +6,7 @@ mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2
http://netcat.sourceforge.net/
GPL-2
the GNU network swiss army knife
-~alpha amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
eutils flag-o-matic multilib portability toolchain-funcs user
debug nls
diff --git a/metadata/cache/net-analyzer/metasploit-4.1.4 b/metadata/cache/net-analyzer/metasploit-4.1.4
new file mode 100644
index 000000000000..4002fc75c024
--- /dev/null
+++ b/metadata/cache/net-analyzer/metasploit-4.1.4
@@ -0,0 +1,22 @@
+
+dev-lang/ruby dev-ruby/rubygems gui? ( virtual/jre ) mysql? ( dev-ruby/mysql-ruby dev-ruby/activerecord[mysql] ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord[postgres] )
+4.1
+http://downloads.metasploit.com/data/releases/framework-latest.tar.bz2
+
+http://www.metasploit.org/
+BSD
+Advanced open-source framework for developing, testing, and using vulnerability exploit code
+~amd64 ~ppc ~sparc ~x86
+eutils multilib portability toolchain-funcs user
+gui mysql postgres
+
+
+
+3
+
+configure install postinst
+
+
+
+
+
diff --git a/metadata/cache/net-dialup/drdsl-1.2.0 b/metadata/cache/net-dialup/drdsl-1.2.0
index b9e25dc1eb8c..49a9d8c4f0f9 100644
--- a/metadata/cache/net-dialup/drdsl-1.2.0
+++ b/metadata/cache/net-dialup/drdsl-1.2.0
@@ -2,9 +2,9 @@ unicode? ( virtual/libiconv ) >=app-arch/rpm2targz-9.0.0.3g
net-dialup/capi4k-utils
0
x86? ( http://opensuse.foehr-it.de/rpms/10_3/2.6.22.13_0.3/32bit/drdsl-1.0-1.i586.rpm ) amd64? ( http://opensuse.foehr-it.de/rpms/10_3/2.6.22.13_0.3/64bit/drdsl-1.0-1.x86_64.rpm )
-strip test
+mirror strip test
http://opensuse.foehr-it.de/
-as-is
+AVM-FC
AVM DSL Assistant for autodetecting DSL values (VPI, VCI, VPP) for 'fcdsl' based cards
~amd64 x86
eutils multilib portability rpm toolchain-funcs user
diff --git a/metadata/cache/net-dns/libidn-1.24 b/metadata/cache/net-dns/libidn-1.24
new file mode 100644
index 000000000000..0ae36b7fbf9b
--- /dev/null
+++ b/metadata/cache/net-dns/libidn-1.24
@@ -0,0 +1,22 @@
+emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=sys-devel/gettext-0.17 ) java? ( >=virtual/jdk-1.4 doc? ( dev-java/gjdoc ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( virtual/libintl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+0
+mirror://gnu/libidn/libidn-1.24.tar.gz
+
+http://www.gnu.org/software/libidn/
+LGPL-2.1 GPL-3
+Internationalized Domain Names (IDN) implementation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+elisp-common eutils java-pkg-opt-2 java-utils-2 mono multilib portability toolchain-funcs user versionator
+doc emacs java mono nls static-libs elibc_FreeBSD java
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-dns/pdns-2.9.22.5 b/metadata/cache/net-dns/pdns-2.9.22.5
new file mode 100644
index 000000000000..cebad8b15558
--- /dev/null
+++ b/metadata/cache/net-dns/pdns-2.9.22.5
@@ -0,0 +1,22 @@
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) >=dev-libs/boost-1.31 doc? ( app-doc/doxygen )
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) >=dev-libs/boost-1.31
+0
+http://downloads.powerdns.com/releases/pdns-2.9.22.5.tar.gz
+
+http://www.powerdns.com/
+GPL-2
+The PowerDNS Daemon
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+debug doc ldap mysql postgres sqlite sqlite3 static opendbx
+
+
+
+2
+
+compile configure install postinst preinst prepare
+
+
+
+
+
diff --git a/metadata/cache/net-dns/pdns-3.0.1 b/metadata/cache/net-dns/pdns-3.0.1
index 3e396fac4759..16f614466b11 100644
--- a/metadata/cache/net-dns/pdns-3.0.1
+++ b/metadata/cache/net-dns/pdns-3.0.1
@@ -6,7 +6,7 @@ http://downloads.powerdns.com/releases/pdns-3.0.1.tar.gz
http://www.powerdns.com/
GPL-2
The PowerDNS Daemon
-~amd64 ~x86
+~amd64 x86
autotools eutils libtool multilib portability toolchain-funcs user
debug doc ldap mysql postgres sqlite sqlite3 static opendbx
diff --git a/metadata/cache/net-misc/wget-1.13.4-r1 b/metadata/cache/net-misc/wget-1.13.4-r1
index ad391f23a070..0af3b4f35e8d 100644
--- a/metadata/cache/net-misc/wget-1.13.4-r1
+++ b/metadata/cache/net-misc/wget-1.13.4-r1
@@ -1,4 +1,4 @@
-!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) ) app-arch/xz-utils static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) ) app-arch/xz-utils dev-util/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) )
0
mirror://gnu/wget/wget-1.13.4.tar.xz
diff --git a/metadata/cache/net-print/hplip-3.11.12-r1 b/metadata/cache/net-print/hplip-3.11.12-r1
new file mode 100644
index 000000000000..67559d467acf
--- /dev/null
+++ b/metadata/cache/net-print/hplip-3.11.12-r1
@@ -0,0 +1,22 @@
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) dev-util/pkgconfig >=app-admin/eselect-python-20091230 !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) >=app-text/ghostscript-gpl-8.71-r3 !minimal? ( dev-python/pygobject:2 kernel_linux? ( >=sys-fs/udev-114 ) scanner? ( dev-python/imaging X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( dev-python/reportlab dev-python/dbus-python ) qt4? ( dev-python/PyQt4[dbus,X] libnotify? ( dev-python/notify-python ) policykit? ( sys-auth/polkit ) ) ) >=app-admin/eselect-python-20091230 !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] )
+0
+mirror://sourceforge/hplip/hplip-3.11.12.tar.gz
+
+http://hplipopensource.com/hplip-web/index.html
+GPL-2
+HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
+~amd64 ~arm ~ppc ~ppc64 ~x86
+autotools eutils fdo-mime libtool linux-info multilib portability python toolchain-funcs user versionator
+doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X
+
+
+
+4
+
+configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-proxy/ufdbguard-1.26 b/metadata/cache/net-proxy/ufdbguard-1.26
deleted file mode 100644
index 052c7c195a68..000000000000
--- a/metadata/cache/net-proxy/ufdbguard-1.26
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/openssl app-arch/bzip2 net-misc/wget sys-devel/bison sys-devel/flex
-dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
-0
-mirror://sourceforge/ufdbguard/ufdbGuard-1.26.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_26.pdf -> ufdbguard-1.26-manual.pdf )
-
-http://www.urlfilterdb.com/en/products/ufdbguard.html
-GPL-2
-ufdbGuard is a redirector for the Squid internet proxy.
-~amd64 ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user
-+httpd doc
-
-
-
-4
-
-configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-proxy/ufdbguard-1.26-r1 b/metadata/cache/net-proxy/ufdbguard-1.26-r1
deleted file mode 100644
index 052c7c195a68..000000000000
--- a/metadata/cache/net-proxy/ufdbguard-1.26-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/openssl app-arch/bzip2 net-misc/wget sys-devel/bison sys-devel/flex
-dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
-0
-mirror://sourceforge/ufdbguard/ufdbGuard-1.26.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_26.pdf -> ufdbguard-1.26-manual.pdf )
-
-http://www.urlfilterdb.com/en/products/ufdbguard.html
-GPL-2
-ufdbGuard is a redirector for the Squid internet proxy.
-~amd64 ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user
-+httpd doc
-
-
-
-4
-
-configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-proxy/ufdbguard-1.27 b/metadata/cache/net-proxy/ufdbguard-1.27-r1
similarity index 100%
rename from metadata/cache/net-proxy/ufdbguard-1.27
rename to metadata/cache/net-proxy/ufdbguard-1.27-r1
diff --git a/metadata/cache/net-wireless/wimax-1.5.2-r1 b/metadata/cache/net-wireless/wimax-1.5.2-r1
index 1764f79a999d..fb9f061b0b59 100644
--- a/metadata/cache/net-wireless/wimax-1.5.2-r1
+++ b/metadata/cache/net-wireless/wimax-1.5.2-r1
@@ -1,5 +1,5 @@
->=dev-libs/libnl-1.1:1.1 >=sys-kernel/linux-headers-2.6.34
->=dev-libs/libnl-1.1:1.1 >=sys-kernel/linux-headers-2.6.34 net-wireless/wimax-tools net-wireless/wpa_supplicant[wimax]
+>=dev-libs/libnl-1.1:1.1 >=sys-kernel/linux-headers-2.6.34 net-wireless/wpa_supplicant[wimax]
+>=dev-libs/libnl-1.1:1.1 >=sys-kernel/linux-headers-2.6.34 net-wireless/wpa_supplicant[wimax] net-wireless/wimax-tools
0
http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=wimax-1.5.2.tar.gz -> wimax-1.5.2.tar.gz
diff --git a/metadata/cache/sci-chemistry/votca-csg-1.2.2 b/metadata/cache/sci-chemistry/votca-csg-1.2.2
index f5a8c5fad932..70ed2f35a741 100644
--- a/metadata/cache/sci-chemistry/votca-csg-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csg-1.2.2
@@ -6,7 +6,7 @@ primaryuri
http://www.votca.org
Apache-2.0
Votca coarse-graining engine
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux
base bash-completion-r1 cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
doc examples extras +gromacs +system-boost
diff --git a/metadata/cache/sci-geosciences/mapserver-6.0.1 b/metadata/cache/sci-geosciences/mapserver-6.0.1
index a45165399569..1bc834b7019a 100644
--- a/metadata/cache/sci-geosciences/mapserver-6.0.1
+++ b/metadata/cache/sci-geosciences/mapserver-6.0.1
@@ -1,4 +1,4 @@
-!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) =www-servers/apache-2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/webapp-config-1.50.15 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) =www-servers/apache-2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/webapp-config-1.50.15 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) =www-servers/apache-2* >=app-admin/webapp-config-1.50.15 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] php? ( || ( =sci-geosciences/mapserver-6.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) )
0
http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz
diff --git a/metadata/cache/sci-libs/arprec-2.2.8 b/metadata/cache/sci-libs/arprec-2.2.8
new file mode 100644
index 000000000000..1cc76f7a86ae
--- /dev/null
+++ b/metadata/cache/sci-libs/arprec-2.2.8
@@ -0,0 +1,22 @@
+fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] )
+0
+http://crd.lbl.gov/~dhbailey/mpdist/arprec-2.2.8.tar.gz
+
+http://crd.lbl.gov/~dhbailey/mpdist/
+BSD
+Arbitrary precision float arithmetics and functions
+~amd64 ~x86
+autotools eutils fortran-2 libtool multilib portability toolchain-funcs user
+doc fortran qd static-libs
+
+
+
+4
+
+compile configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-libs/ccfits-2.3 b/metadata/cache/sci-libs/ccfits-2.3
deleted file mode 100644
index 0498a0b20638..000000000000
--- a/metadata/cache/sci-libs/ccfits-2.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sci-libs/cfitsio-3.080 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sci-libs/cfitsio-3.080
-0
-http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.3.tar.gz
-
-http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
-BSD
-C++ interface for cfitsio
-~amd64 ~x86
-autotools eutils libtool multilib portability toolchain-funcs user
-doc
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-libs/ccfits-2.2 b/metadata/cache/sci-libs/ccfits-2.4
similarity index 73%
rename from metadata/cache/sci-libs/ccfits-2.2
rename to metadata/cache/sci-libs/ccfits-2.4
index 8a731fbbbe75..f35e4c744c24 100644
--- a/metadata/cache/sci-libs/ccfits-2.2
+++ b/metadata/cache/sci-libs/ccfits-2.4
@@ -1,20 +1,20 @@
>=sci-libs/cfitsio-3.080 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
>=sci-libs/cfitsio-3.080
0
-http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.2.tar.gz
+http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.4.tar.gz
http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
BSD
C++ interface for cfitsio
~amd64 ~x86
autotools eutils libtool multilib portability toolchain-funcs user
-doc
+doc static-libs
-2
+4
-install prepare test
+configure install prepare
diff --git a/metadata/cache/sci-libs/qd-2.3.12 b/metadata/cache/sci-libs/qd-2.3.12
new file mode 100644
index 000000000000..5ea8a35bf21e
--- /dev/null
+++ b/metadata/cache/sci-libs/qd-2.3.12
@@ -0,0 +1,22 @@
+fortran? ( virtual/fortran ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+fortran? ( virtual/fortran )
+0
+http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.12.tar.gz
+
+http://crd.lbl.gov/~dhbailey/mpdist/
+BSD
+Quad-double and double-double float arithmetics
+~amd64 ~x86
+autotools eutils fortran-2 libtool multilib portability toolchain-funcs user
+doc fortran static-libs
+
+
+
+4
+
+configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/openrc-0.9.7 b/metadata/cache/sys-apps/openrc-0.9.7
deleted file mode 100644
index 612f47ea3084..000000000000
--- a/metadata/cache/sys-apps/openrc-0.9.7
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( !=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( !=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.0.16
+mirror://kernel/linux/kernel/v3.x/patch-3.0.16.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
+binchecks strip
+http://www.kernel.org
+GPL-2 !deblob? ( freedist )
+Full sources for the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.17 b/metadata/cache/sys-kernel/vanilla-sources-3.0.17
new file mode 100644
index 000000000000..19110f17a210
--- /dev/null
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.0.17
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.0.17
+mirror://kernel/linux/kernel/v3.x/patch-3.0.17.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
+binchecks strip
+http://www.kernel.org
+GPL-2 !deblob? ( freedist )
+Full sources for the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.6 b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
index cd6eccb85468..febfb9bb5254 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.1.6
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
@@ -6,7 +6,7 @@ binchecks strip
http://www.kernel.org
GPL-2 !deblob? ( freedist )
Full sources for the Linux kernel
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
eutils kernel-2 multilib portability toolchain-funcs user versionator
deblob symlink build deblob
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.9 b/metadata/cache/sys-kernel/vanilla-sources-3.1.9
new file mode 100644
index 000000000000..1d0a906fab8a
--- /dev/null
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.9
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.1.9
+mirror://kernel/linux/kernel/v3.x/patch-3.1.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
+binchecks strip
+http://www.kernel.org
+GPL-2 !deblob? ( freedist )
+Full sources for the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.1 b/metadata/cache/sys-kernel/vanilla-sources-3.2.1
new file mode 100644
index 000000000000..f2d199b57be7
--- /dev/null
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.1
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.2.1
+mirror://kernel/linux/kernel/v3.x/patch-3.2.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
+binchecks strip
+http://www.kernel.org
+GPL-2 !deblob? ( freedist )
+Full sources for the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/mtdev-1.1.0 b/metadata/cache/sys-libs/mtdev-1.1.0
index ad6299755252..db000dbe4183 100644
--- a/metadata/cache/sys-libs/mtdev-1.1.0
+++ b/metadata/cache/sys-libs/mtdev-1.1.0
@@ -6,7 +6,7 @@ http://bitmath.org/code/mtdev/mtdev-1.1.0.tar.bz2
http://bitmath.org/code/mtdev/
MIT
Multitouch Protocol Translation Library
-~amd64 ~hppa ~x86
+~amd64 ~arm ~hppa ~x86
static-libs
diff --git a/metadata/cache/www-client/chromium-18.0.1003.1 b/metadata/cache/www-client/chromium-18.0.1003.1
index bd7e1bbc7f96..1e3033162ef9 100644
--- a/metadata/cache/www-client/chromium-18.0.1003.1
+++ b/metadata/cache/www-client/chromium-18.0.1003.1
@@ -1,5 +1,5 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
0
http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1003.1.tar.bz2
diff --git a/metadata/cache/www-client/chromium-9999-r1 b/metadata/cache/www-client/chromium-9999-r1
index 8c438e5a4089..b9fb5a95379b 100644
--- a/metadata/cache/www-client/chromium-9999-r1
+++ b/metadata/cache/www-client/chromium-9999-r1
@@ -1,5 +1,5 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
live
diff --git a/metadata/cache/www-client/firefox-9.0 b/metadata/cache/www-client/firefox-9.0
index 0027780375d0..92f3b27c94d0 100644
--- a/metadata/cache/www-client/firefox-9.0
+++ b/metadata/cache/www-client/firefox-9.0
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz
http://www.mozilla.com/firefox
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Firefox Web Browser
-~alpha amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux
autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils portability python toolchain-funcs user versionator virtualx
bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
diff --git a/metadata/cache/www-client/firefox-bin-9.0.1 b/metadata/cache/www-client/firefox-bin-9.0.1
index 9d5854fbb369..cac9ec19f66e 100644
--- a/metadata/cache/www-client/firefox-bin-9.0.1
+++ b/metadata/cache/www-client/firefox-bin-9.0.1
@@ -6,7 +6,7 @@ strip mirror
http://www.mozilla.com/firefox
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Firefox Web Browser
--* amd64 ~x86
+-* amd64 x86
eutils fdo-mime gnome2-utils mozextension mozilla-launcher multilib nsplugins pax-utils portability toolchain-funcs user
startup-notification linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu
diff --git a/metadata/cache/www-client/seamonkey-2.6.1 b/metadata/cache/www-client/seamonkey-2.6.1
index abe2c26cc5f1..9ac16d39e7dc 100644
--- a/metadata/cache/www-client/seamonkey-2.6.1
+++ b/metadata/cache/www-client/seamonkey-2.6.1
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/source/seamonkey-2.6.1.source
http://www.seamonkey-project.org
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Seamonkey Web Browser
-~alpha amd64 ~arm ~ppc ~x86
+~alpha amd64 ~arm ~ppc x86
autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils portability python toolchain-funcs user versionator
+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm linguas_be linguas_ca linguas_cs linguas_de linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_pl linguas_pt_PT linguas_pt linguas_ru linguas_sk linguas_sv_SE linguas_sv linguas_tr linguas_zh_CN linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
diff --git a/metadata/cache/www-client/seamonkey-bin-2.6.1 b/metadata/cache/www-client/seamonkey-bin-2.6.1
index c73c124501b8..7687b81c2f30 100644
--- a/metadata/cache/www-client/seamonkey-bin-2.6.1
+++ b/metadata/cache/www-client/seamonkey-bin-2.6.1
@@ -6,7 +6,7 @@ strip
http://www.seamonkey-project.org/
|| ( MPL-1.1 GPL-2 LGPL-2.1 )
Mozilla Application Suite - web browser, email, HTML editor, IRC
--* amd64 ~x86
+-* amd64 x86
eutils fdo-mime gnome2-utils mozextension mozilla-launcher multilib nsplugins pax-utils portability toolchain-funcs user
startup-notification linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_en linguas_en_US linguas_en linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_pl linguas_pt_PT linguas_pt linguas_ru linguas_sk linguas_sv_SE linguas_sv linguas_tr linguas_zh_CN linguas_zh
diff --git a/metadata/cache/x11-drivers/ati-drivers-11.12-r1 b/metadata/cache/x11-drivers/ati-drivers-11.12-r1
new file mode 100644
index 000000000000..18dfae4fd8e6
--- /dev/null
+++ b/metadata/cache/x11-drivers/ati-drivers-11.12-r1
@@ -0,0 +1,22 @@
+<=x11-base/xorg-server-1.11.49 >=app-admin/eselect-opengl-1.0.7 sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) opencl? ( !>=x11-drivers/nvidia-drivers-195 ) x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+<=x11-base/xorg-server-1.11.49 >=app-admin/eselect-opengl-1.0.7 sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) opencl? ( !>=x11-drivers/nvidia-drivers-195 ) kernel_linux? ( sys-apps/module-init-tools )
+1
+http://www2.ati.com/drivers/linux//ati-driver-installer-11-12-x86.x86_64.run
+
+http://www.ati.com
+AMD GPL-2 QPL-1.0 as-is
+Ati precompiled drivers for r600 (HD Series) and newer chipsets
+~amd64 ~x86
+eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
+debug +modules multilib opencl pax_kernel qt4 kernel_linux
+
+
+
+4
+
+compile install postinst postrm preinst prepare prerm pretend setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-proto/inputproto-2.1.99.4 b/metadata/cache/x11-proto/inputproto-2.1.99.5
similarity index 98%
rename from metadata/cache/x11-proto/inputproto-2.1.99.4
rename to metadata/cache/x11-proto/inputproto-2.1.99.5
index 9e472591e565..e9432e7ad61a 100644
--- a/metadata/cache/x11-proto/inputproto-2.1.99.4
+++ b/metadata/cache/x11-proto/inputproto-2.1.99.5
@@ -1,7 +1,7 @@
!=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
0
-http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.1.99.4.tar.bz2
+http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.1.99.5.tar.bz2
http://xorg.freedesktop.org/
MIT
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 262407b5e18c..da9fdea63e8d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2012 06:06:46 +0000
+Fri, 13 Jan 2012 09:06:47 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 262407b5e18c..da9fdea63e8d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2012 06:06:46 +0000
+Fri, 13 Jan 2012 09:06:47 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 16d1b6904727..0763c83be3b0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2012 06:06:48 +0000
+Fri, 13 Jan 2012 09:06:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 425c83f97980..558ec7bd4984 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 12 06:06:46 UTC 2012
+Fri Jan 13 09:06:47 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2becf1d1316a..530ff7b62615 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jan 2012 06:30:01 +0000
+Fri, 13 Jan 2012 09:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1516eaef5df7..dd8adc40322c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1326348301 Thu Jan 12 06:05:01 2012 UTC
+1326445501 Fri Jan 13 09:05:01 2012 UTC
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
index 9e200682a33a..2d3fa6887f6f 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild,v 1.3 2012/01/09 03:56:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild,v 1.4 2012/01/12 21:12:20 maekke Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nls"
S=${WORKDIR}/netcat-${PV}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 53aa6a3a1fe4..71aa655b9aaa 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -6,3 +6,4 @@ DIST framework-3.5.0.tar.bz2 42254784 RMD160 090d557574b8e98e461f9de2bb95f604d74
DIST framework-3.6.0.tar.bz2 47125266 RMD160 afdbce02626ac994d8351d69846a5033758c2783 SHA1 1c78cd774204d6edd6e795ef1dff36d49836f530 SHA256 a113cf9e1a499377807990e506acad83afee18845a148a02747087132fac39a7
DIST framework-3.7.0.tar.bz2 49488660 RMD160 56c76a7d24372f48f5d84da1713acbc7f54590af SHA1 8ca60e75b90da4555274b5fb3a20a152c581aa02 SHA256 1e39a0de7e4b6cc4144b5ea47b3598e6edf27ac00abac5d84e1fec04b7f95dc5
DIST framework-4.0.0.tar.bz2 79515768 RMD160 f8eedb9d68f30b245217b4ed40308dcd351d37c5 SHA1 f1768564be92abcea3ea34fde14acb1af4d52f1d SHA256 45c3c379ea82e46d8efef9cbbe0afa8ae8df98e50f2642afcea84a86c83c5a50
+DIST framework-latest.tar.bz2 77862536 RMD160 33b8e617105552e611356dd337fa29fc84a45362 SHA1 f978b82d0b5d65e2958006aa9a6fca01573b9539 SHA256 f172b46ce6ea19845bfcf919017190bc0b17bc6631259d814c0b639a4a896467
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-conf b/net-analyzer/metasploit/files/msfrpcd-4.1-conf
new file mode 100644
index 000000000000..dc56a9d966a6
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.1-conf
@@ -0,0 +1,25 @@
+# Config file for /etc/init.d/msfrpcd
+
+# msfrpcd -h for more info
+
+# Bind to the following IP instead of 0.0.0.0
+MSF_OPTS="-a 127.0.0.1"
+
+# Bind to the following TCP port instead of default 55553
+#MSF_OPTS="${MSF_OPTS} -p 55553"
+
+# Specify the username to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -U msf"
+
+# Specify the password to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -P secret"
+
+# Server type, [Basic|Web]
+#MSF_OPTS="${MSF_OPTS} -t Basic"
+
+# URI for Web server
+#MSF_OPTS="${MSF_OPTS} -u "
+
+# Disable SSL on the XMLRPC socket
+# JAVA GUI doesn't support SSL as of Nov 6, 2010
+MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-initd b/net-analyzer/metasploit/files/msfrpcd-4.1-initd
new file mode 100644
index 000000000000..7527d9c7cf78
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.1-initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.1-initd,v 1.1 2012/01/12 08:14:41 patrick Exp $
+
+VERSION=4.0
+PIDFILE=/var/run/msfrpcd${VERSION}.pid
+
+start() {
+ ebegin "Starting msfrpcd${VERSION}"
+ start-stop-daemon --start --quiet --background \
+ --exec /usr/lib/metasploit${VERSION}/msfrpcd \
+ --pidfile ${PIDFILE} \
+ --make-pidfile -- -f ${MSF_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping msfrpcd${VERSION}"
+ start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/net-analyzer/metasploit/metasploit-4.1.4.ebuild b/net-analyzer/metasploit/metasploit-4.1.4.ebuild
new file mode 100644
index 000000000000..906d4bf17bc9
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.1.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.1.4.ebuild,v 1.1 2012/01/12 08:14:41 patrick Exp $
+
+EAPI="3"
+inherit eutils
+
+#SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
+# Naughty upstream ... no versioning at the moment
+SRC_URI="http://downloads.metasploit.com/data/releases/framework-latest.tar.bz2"
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+
+LICENSE="BSD"
+SLOT="4.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gui mysql postgres"
+
+# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
+# such solution, bug #247787
+RDEPEND="dev-lang/ruby
+ dev-ruby/rubygems
+ gui? ( virtual/jre )
+ mysql? ( dev-ruby/mysql-ruby
+ dev-ruby/activerecord[mysql] )
+ postgres? ( dev-ruby/ruby-postgres
+ dev-ruby/activerecord[postgres] )"
+DEPEND=""
+
+QA_PRESTRIPPED="
+ usr/lib/${PN}${SLOT}/data/msflinker_linux_x86.bin
+ usr/lib/${PN}${SLOT}/data/templates/template_armle_linux.bin
+ usr/lib/${PN}${SLOT}/data/templates/template_x86_linux.bin"
+
+QA_EXECSTACK="
+ usr/lib/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin"
+QA_WX_LOAD="
+ usr/lib/${PN}${SLOT}/data/templates/template_*_linux.bin"
+
+S=${WORKDIR}/msf
+
+src_configure() {
+ # upstream makes weird tarbllz
+ find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
+
+ rm "${S}"/msfupdate
+ chmod +x "${S}"/msf*
+
+ use gui || rm msfgui
+}
+
+src_install() {
+ # should be as simple as copying everything into the target...
+ dodir /usr/lib/${PN}${SLOT}
+ cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT}
+ chown -R root:0 "${D}"
+
+ # do not remove LICENSE, bug #238137
+ dodir /usr/share/doc/${PF}
+ cp "${S}"/{README,HACKING} "${D}"/usr/share/doc/${PF}
+ dosym /usr/lib/${PN}${SLOT}/documentation /usr/share/doc/${PF}/documentation
+
+ dodir /usr/bin/
+ for file in msf*; do
+ dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
+ done
+
+ newinitd "${FILESDIR}"/msfrpcd-${SLOT}-initd msfrpcd${SLOT} || die
+ newconfd "${FILESDIR}"/msfrpcd-${SLOT}-conf msfrpcd${SLOT} || die
+
+ use gui && make_desktop_entry msfgui${SLOT} \
+ "Metasploit Framework" \
+ metasploit \
+ 'GNOME;System;Network;' &&
+ doicon "${FILESDIR}"/metasploit.xpm
+
+ # Avoid useless revdep-rebuild trigger #377617
+ dodir /etc/revdep-rebuild/
+ echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
+ ${D}/etc/revdep-rebuild/70-${PN}-${SLOT}
+}
+
+pkg_postinst() {
+ if use gui; then
+ elog "You will need to create a /usr/bin/msfrpcd symlink pointing to"
+ elog "the version of msfrpcd if you want to be able to start msfrpcd"
+ elog "from the java gui."
+ elog
+ elog "ln /usr/bin/msfrpcd${SLOT} /usr/bin/msfrpcd"
+ elog
+ fi
+}
diff --git a/net-dialup/drdsl/drdsl-1.2.0.ebuild b/net-dialup/drdsl/drdsl-1.2.0.ebuild
index 686ea95d813a..ee072fa2367e 100644
--- a/net-dialup/drdsl/drdsl-1.2.0.ebuild
+++ b/net-dialup/drdsl/drdsl-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/drdsl/drdsl-1.2.0.ebuild,v 1.5 2008/01/06 01:21:54 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/drdsl/drdsl-1.2.0.ebuild,v 1.6 2012/01/12 22:57:53 ulm Exp $
inherit eutils rpm
@@ -11,7 +11,7 @@ HOMEPAGE="http://opensuse.foehr-it.de/"
SRC_URI="x86? ( http://opensuse.foehr-it.de/rpms/${REL}/32bit/${PN}-1.0-1.i586.rpm )
amd64? ( http://opensuse.foehr-it.de/rpms/${REL}/64bit/${PN}-1.0-1.x86_64.rpm )"
-LICENSE="as-is"
+LICENSE="AVM-FC"
SLOT="0"
KEYWORDS="~amd64 x86"
IUSE="unicode"
@@ -19,7 +19,7 @@ IUSE="unicode"
DEPEND="unicode? ( virtual/libiconv )"
RDEPEND="net-dialup/capi4k-utils"
-RESTRICT="strip test"
+RESTRICT="mirror strip test"
S="${WORKDIR}"
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index d39ade9b6f8a..86c2e9938ac7 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,2 +1,3 @@
DIST libidn-1.22.tar.gz 3356444 RMD160 46773bd6192faaeef52c88b6aa8d2e3242f2cdd8 SHA1 8358e897c24d534438f6b5694c25e85889d860c3 SHA256 2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed
DIST libidn-1.23.tar.gz 3477618 RMD160 22922f29abe5045f4cb1c30d3b3f75950e5b8b1c SHA1 98b00aeb8240a7a6e02f338edd6ef08adbc31a34 SHA256 25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a
+DIST libidn-1.24.tar.gz 3325775 RMD160 edccad6c09b181ebcd8360a2d3abdfd1283e5486 SHA1 4251c108966375ede4df15d76a1bd9a4440f44ee SHA256 da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff
diff --git a/net-dns/libidn/libidn-1.24.ebuild b/net-dns/libidn/libidn-1.24.ebuild
new file mode 100644
index 000000000000..a81c399964a9
--- /dev/null
+++ b/net-dns/libidn/libidn-1.24.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.24.ebuild,v 1.1 2012/01/12 17:53:22 jer Exp $
+
+EAPI="4"
+
+inherit java-pkg-opt-2 mono elisp-common
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc emacs java mono nls static-libs"
+
+COMMON_DEPEND="emacs? ( virtual/emacs )
+ mono? ( >=dev-lang/mono-0.95 )"
+DEPEND="${COMMON_DEPEND}
+ nls? ( >=sys-devel/gettext-0.17 )
+ java? (
+ >=virtual/jdk-1.4
+ doc? ( dev-java/gjdoc )
+ )"
+RDEPEND="${COMMON_DEPEND}
+ nls? ( virtual/libintl )
+ java? ( >=virtual/jre-1.4 )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+ # bundled, with wrong bytecode
+ rm "${S}/java/${P}.jar" || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_enable java) \
+ $(use_enable mono csharp mono) \
+ $(use_enable static-libs static) \
+ --disable-valgrind-tests \
+ --with-lispdir="${SITELISP}/${PN}" \
+ --with-packager="Gentoo" \
+ --with-packager-version="r${PR}" \
+ --with-packager-bug-reports="https://bugs.gentoo.org"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ elisp-compile src/*.el || die
+ fi
+}
+
+src_install() {
+ default
+ dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+ if use emacs; then
+ # *.el are installed by the build system
+ elisp-install ${PN} src/*.elc || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ else
+ rm -rf "${D}/usr/share/emacs"
+ fi
+
+ if use doc ; then
+ dohtml -r doc/reference/html/*
+ fi
+
+ if use java ; then
+ java-pkg_newjar java/${P}.jar ${PN}.jar || die
+ rm -rf "${D}"/usr/share/java || die
+
+ if use doc ; then
+ java-pkg_dojavadoc doc/java
+ fi
+ fi
+ if ! use static-libs; then
+ rm -f "${D}"/usr/lib*/lib*.la
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index af57dc73f87b..80a915afbfce 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,4 @@
+DIST pdns-2.9.22.5.tar.gz 1077617 RMD160 8be76a7a63c3366d55724815245e2f955ec0adda SHA1 7a514fe624c110afb8a262f4d76376d0f8e17bea SHA256 f85a18e8fec99b687854852738b04d32fca407bfd1198c681fc3c85dd6e83a07
DIST pdns-2.9.22.tar.gz 1072257 RMD160 be9bff3edac0a9700eaf8ac30c77bfc8336b7d92 SHA1 2c0888c8252299c5a17dc69eec289e90c7e8f3ff SHA256 7c03da01c2cbd8bbe897180bc3bd50ca8cfaa63ada94dc6b29f7745b82e17525
DIST pdns-3.0.1.tar.gz 1196471 RMD160 996fb9db4d94456d01df840c61c1500d40ea2b1e SHA1 88205f0fd80268113aadcc0a4cffd2dfd4b9df44 SHA256 922554431737b4a8126a8c4b5be3126eb8bf8ac2a086e3030d1cf4b3dfa7d1b9
DIST pdns-3.0.tar.gz 1202795 RMD160 d4042f6711743f7b35439de313fe675d06354236 SHA1 d5de28ec125fa14deebc834d01a48922f9bac910 SHA256 a468b24b35c2595cc81119c3c8f2db4bd3566266431853e7d6be5930f692b0a2
diff --git a/net-dns/pdns/pdns-2.9.22.5.ebuild b/net-dns/pdns/pdns-2.9.22.5.ebuild
new file mode 100644
index 000000000000..ab38c85cca02
--- /dev/null
+++ b/net-dns/pdns/pdns-2.9.22.5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.5.ebuild,v 1.1 2012/01/12 19:05:38 swegener Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="The PowerDNS Daemon"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
+HOMEPAGE="http://www.powerdns.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ldap mysql postgres sqlite sqlite3 static opendbx"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql-base )
+ ldap? ( >=net-nds/openldap-2.0.27-r4 )
+ sqlite? ( =dev-db/sqlite-2.8* )
+ sqlite3? ( =dev-db/sqlite-3* )
+ opendbx? ( dev-db/opendbx )
+ >=dev-libs/boost-1.31"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
+}
+
+src_configure() {
+ local modules="pipe geo" myconf=""
+
+ use mysql && modules="${modules} gmysql"
+ use postgres && modules="${modules} gpgsql"
+ use sqlite && modules="${modules} gsqlite"
+ use sqlite3 && modules="${modules} gsqlite3"
+ use opendbx && modules="${modules} opendbx"
+ use ldap && modules="${modules} ldap"
+ use debug && myconf="${myconf} --enable-verbose-logging"
+
+ econf \
+ --sysconfdir=/etc/powerdns \
+ --libdir=/usr/$(get_libdir)/powerdns \
+ --disable-recursor \
+ --with-modules= \
+ --with-dynmodules="${modules}" \
+ --with-pgsql-includes=/usr/include \
+ --with-pgsql-lib=/usr/$(get_libdir) \
+ --with-mysql-lib=/usr/$(get_libdir) \
+ --with-sqlite-lib=/usr/$(get_libdir) \
+ --with-sqlite3-lib=/usr/$(get_libdir) \
+ $(use_enable static static-binaries) \
+ ${myconf} \
+ || die "econf failed"
+}
+
+src_compile() {
+ default
+
+ if use doc
+ then
+ emake -C codedocs codedocs || die "emake codedocs failed"
+ fi
+}
+
+src_install () {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+ # set defaults: setuid=pdns, setgid=pdns
+ sed -i \
+ -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+ "${D}"/etc/powerdns/pdns.conf
+
+ doinitd "${FILESDIR}"/pdns
+
+ keepdir /var/empty
+
+ dodoc ChangeLog README TODO
+ use doc && dohtml -r codedocs/html/.
+
+ # Install development headers
+ insinto /usr/include/pdns
+ doins pdns/*.hh
+ insinto /usr/include/pdns/backends/gsql
+ doins pdns/backends/gsql/*.hh
+}
+
+pkg_preinst() {
+ enewgroup pdns
+ enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+ elog
+ elog "PowerDNS provides multiple instances support. You can create more instances"
+ elog "by symlinking the pdns init script to another name."
+ elog
+ elog "The name must be in the format pdns. and PowerDNS will use the"
+ elog "/etc/powerdns/pdns-.conf configuration file instead of the default."
+ elog
+}
diff --git a/net-dns/pdns/pdns-3.0.1.ebuild b/net-dns/pdns/pdns-3.0.1.ebuild
index 64b2ebbc71d0..664405474dfc 100644
--- a/net-dns/pdns/pdns-3.0.1.ebuild
+++ b/net-dns/pdns/pdns-3.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/net-dns/pdns/pdns-3.0.1.ebuild,v 1.1 2012/01/10 20:37:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.1.ebuild,v 1.2 2012/01/12 17:29:56 phajdan.jr Exp $
EAPI=2
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.powerdns.com/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="debug doc ldap mysql postgres sqlite sqlite3 static opendbx"
RDEPEND="mysql? ( virtual/mysql )
diff --git a/net-misc/wget/wget-1.13.4-r1.ebuild b/net-misc/wget/wget-1.13.4-r1.ebuild
index 433eccf1661b..f33e9fca932f 100644
--- a/net-misc/wget/wget-1.13.4-r1.ebuild
+++ b/net-misc/wget/wget-1.13.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.3 2011/12/01 16:53:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.4 2012/01/13 06:19:16 vapier Exp $
EAPI="4"
@@ -23,6 +23,7 @@ LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
app-arch/xz-utils
+ dev-util/pkgconfig
static? ( ${LIB_DEPEND} )
nls? ( sys-devel/gettext )"
diff --git a/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch b/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch
new file mode 100644
index 000000000000..288a887a7a44
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.11.12-black-stripes-pcl5c.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h
+--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000
++++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100
+@@ -48,6 +48,7 @@ public:
+ DRIVER_ERROR Configure(Pipeline **pipeline);
+ DRIVER_ERROR EndJob();
+ DRIVER_ERROR FormFeed();
++ bool CanSkipRasters() {return false;}
+ protected:
+ virtual DRIVER_ERROR addJobSettings();
+ void configureRasterData();
diff --git a/net-print/hplip/hplip-3.11.12-r1.ebuild b/net-print/hplip/hplip-3.11.12-r1.ebuild
new file mode 100644
index 000000000000..f7844c5e545b
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.12-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.12-r1.ebuild,v 1.1 2012/01/12 19:19:01 billie Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="!minimal? 2"
+PYTHON_USE_WITH="threads xml"
+PYTHON_USE_WITH_OPT="!minimal"
+
+inherit fdo-mime linux-info python autotools
+
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
+IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
+
+COMMON_DEPEND="
+ virtual/jpeg
+ hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+ acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
+ snmp? (
+ net-analyzer/net-snmp
+ dev-libs/openssl
+ )
+ !minimal? (
+ >=net-print/cups-1.4.0
+ virtual/libusb:0
+ scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+ fax? ( sys-apps/dbus )
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+ >=app-text/ghostscript-gpl-8.71-r3
+ !minimal? (
+ dev-python/pygobject:2
+ kernel_linux? ( >=sys-fs/udev-114 )
+ scanner? (
+ dev-python/imaging
+ X? ( || (
+ kde? ( kde-misc/skanlite )
+ media-gfx/xsane
+ media-gfx/sane-frontends
+ ) )
+ )
+ fax? (
+ dev-python/reportlab
+ dev-python/dbus-python
+ )
+ qt4? (
+ dev-python/PyQt4[dbus,X]
+ libnotify? (
+ dev-python/notify-python
+ )
+ policykit? (
+ sys-auth/polkit
+ )
+ )
+ )"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+ if ! use minimal; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+
+ ! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+ use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
+ fi
+
+ if use minimal ; then
+ ewarn "Installing driver portions only, make sure you know what you are doing."
+ ewarn "Depending on the USE flags set for hpcups and/or hpijs the appropiate"
+ ewarn "drivers are installed."
+ else
+ use parport && linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ use !minimal && python_convert_shebangs -q -r 2 .
+
+ # Fix for Gentoo bug #345725
+ sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
+ $(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+ || die
+
+ # Do not install desktop files if there is no gui
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+ epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
+
+ # Browser detection through xdg-open
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
+ epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
+
+ # Use cups-config when checking for cupsddk
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
+ epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
+
+ # Htmldocs are not installed under docdir/html so enable htmldir configure
+ # switch
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
+ epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
+
+ # Increase systray check timeout for slower machines
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
+ epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
+
+ # Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
+ # Upstream bug: None
+ epatch "${FILESDIR}"/${P}-udev-rules.patch
+
+ # CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
+ # http://secunia.com/advisories/42956/
+ # https://bugzilla.redhat.com/show_bug.cgi?id=662740
+ epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
+
+ # Fix black stripes on pcl5c printouts
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
+ epatch "${FILESDIR}"/${P}-black-stripes-pcl5c.patch
+
+ # Force recognition of Gentoo distro by hp-check
+ sed -i \
+ -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+ installer/core_install.py || die
+
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || die
+ mv ${i}.temp ${i}
+ done
+
+ eautoreconf
+}
+
+src_configure() {
+ local gui_build myconf drv_build minimal_build
+
+ if use qt4 ; then
+ gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+ if use policykit ; then
+ myconf="--enable-policykit"
+ else
+ myconf="--disable-policykit"
+ fi
+ else
+ gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
+ fi
+
+ if use fax || use qt4 ; then
+ myconf="${myconf} --enable-dbus-build"
+ else
+ myconf="${myconf} --disable-dbus-build"
+ fi
+
+ if use hpcups ; then
+ drv_build="$(use_enable hpcups hpcups-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-cups-ppd-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ else
+ drv_build="${drv_build} --enable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+ else
+ drv_build="--disable-hpcups-install --disable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+
+ if use hpijs ; then
+ drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-foomatic-ppd-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ else
+ drv_build="${drv_build} --enable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+ else
+ drv_build="${drv_build} --disable-hpijs-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+
+ if use minimal ; then
+ if use hpijs ; then
+ minimal_build="--enable-hpijs-only-build"
+ else
+ minimal_build="--disable-hpijs-only-build"
+ fi
+ if use hpcups ; then
+ minimal_build="${minimal_build} --enable-hpcups-only-build"
+ else
+ minimal_build="${minimal_build} --disable-hpcups-only-build"
+ fi
+ fi
+
+ econf \
+ --disable-cups11-build \
+ --disable-lite-build \
+ --disable-foomatic-rip-hplip-install \
+ --disable-shadow-build \
+ --with-cupsbackenddir=$(cups-config --serverbin)/backend \
+ --with-cupsfilterdir=$(cups-config --serverbin)/filter \
+ --with-docdir=/usr/share/doc/${PF} \
+ --with-htmldir=/usr/share/doc/${PF}/html \
+ ${gui_build} \
+ ${myconf} \
+ ${drv_build} \
+ ${minimal_build} \
+ $(use_enable doc doc-build) \
+ $(use_enable fax fax-build) \
+ $(use_enable parport pp-build) \
+ $(use_enable scanner scan-build) \
+ $(use_enable snmp network-build) \
+ $(use_enable acl udev-acl-rules)
+}
+
+src_install() {
+ default
+
+ # Installed by sane-backends
+ # Gentoo Bug: #201023
+ rm -f "${D}"/etc/sane.d/dll.conf || die
+
+ rm -f "${D}"/usr/share/doc/${P}/{copyright,README_LIBJPG,COPYING} || die
+ rmdir "${D}"/usr/share/doc/${P}/ >/dev/null
+
+ # Remove hal fdi files
+ rm -rf "${D}"/usr/share/hal || die
+
+ find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die
+}
+
+pkg_postinst() {
+ use !minimal && python_mod_optimize /usr/share/${PN}
+ fdo-mime_desktop_database_update
+
+ elog "For more information on setting up your printer please take"
+ elog "a look at the hplip section of the gentoo printing guide:"
+ elog "http://www.gentoo.org/doc/en/printing-howto.xml"
+}
+
+pkg_postrm() {
+ use !minimal && python_mod_cleanup /usr/share/${PN}
+ fdo-mime_desktop_database_update
+}
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
index 7cb0536b55f7..47835ebdee9f 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -1,6 +1,4 @@
DIST ufdbGuard-1.24.tar.gz 747635 RMD160 48209be420bf9593a46a89be92be4a19ddfd0841 SHA1 30e3fdf7a3c04415f743cf32a4bde18b60b966f9 SHA256 6e5df4ef7f5d13d1ad2a0902449c9909cc013242f3783925800df5011bd3446c
-DIST ufdbGuard-1.26.tar.gz 766725 RMD160 10f881cf40a5294ee074b913042e273ce6674149 SHA1 cbb035e03e943749bd5f3a35ec49f6dc1dbef706 SHA256 f4d72cc4ea1e2983207d2509d3408b04041bcfc48a790338c5a8b5e6662c8eac
DIST ufdbGuard-1.27.tar.gz 780380 RMD160 a624c7843343d151674db0d64730bb12707d82a1 SHA1 d0de38f0f5ea2f69e3b3a24eefe8cb02e77671d3 SHA256 b70c531e670d1ee817048ee1c25ab5ad844b39b54013eb262a61d1473a41353c
DIST ufdbguard-1.24-manual.pdf 491034 RMD160 f0eb280602c5bbc191431457bc49714ed1260a44 SHA1 eeb415fe32d84d27bda4250bb2b67196d7fe93d0 SHA256 7185161d912202510ec1767fc0239f48c2a98f948afb3a207ea55c341e03e459
-DIST ufdbguard-1.26-manual.pdf 494360 RMD160 901d3cd4d5da6976c7e27a2db181e8948f50e4ce SHA1 375234c4bfd627bc9db48e7816f757ebde137f58 SHA256 b0ef3e648c0a9336018ddc7180b853ef904c108c7318d8c5ebaba7015fd185a4
DIST ufdbguard-1.27-manual.pdf 501140 RMD160 f9c8b5186c9c5ef332ff00e01ecde1772cfa689e SHA1 5078c02a1a8e70016e974a81093b8e08581e6b2d SHA256 9d5cba88b4be71528a60daf6576c662dd69b01d344bc9fd721f70db6ad32d288
diff --git a/net-proxy/ufdbguard/files/ufdb.initd.2 b/net-proxy/ufdbguard/files/ufdb.initd.2
index 75370da7917d..ec7312aedd42 100644
--- a/net-proxy/ufdbguard/files/ufdb.initd.2
+++ b/net-proxy/ufdbguard/files/ufdb.initd.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.1 2011/10/22 00:15:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.2 2012/01/12 13:22:22 flameeyes Exp $
# reconfig is what the upstream documentation suggests, so let's
# provide it for compatibility.
@@ -47,7 +47,7 @@ gentables() {
start_pre() {
gentables
- checkpath -d -m 0755 -o ${UFDB_USER} $(get_config logdir) /var/run/ufdbguardd
+ checkpath -d -m 0755 -o ${UFDB_USER} $(get_config logdir) "$(dirname "${pidfile}")"
}
reload() {
diff --git a/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild b/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild
deleted file mode 100644
index 2497f64aa63e..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild,v 1.1 2011/10/22 00:15:55 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-MY_P="ufdbGuard-${PV}"
-
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
-HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
- doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+httpd doc"
-
-RDEPEND="dev-libs/openssl
- app-arch/bzip2
- net-misc/wget"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-RDEPEND="${RDEPEND}
- sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # create the squid user exactly as done by net-proxy/squid-3.1.9
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
- epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
-
- egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
- sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
- || die
-
- # directory where ufdbhttpd is to be found
- sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
- src/ufdb.h.in || die
-}
-
-src_configure() {
- # better safe than sorry, the code has a number of possible
- # breakage, and at least one certain breakage.
- append-flags -fno-strict-aliasing
-
- econf \
- --with-ufdb-user=squid \
- --with-ufdb-config=/etc \
- --with-ufdb-logdir=/var/log/ufdbguard \
- --with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
- --with-ufdb-images_dir=/usr/share/ufdbguard/images
-}
-
-src_install() {
- dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
- doman doc/*.1
-
- dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
- src/ufdbConvertDB
- dosbin src/ufdbUpdate
-
- exeinto /usr/libexec/ufdbguard
- doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
-
- if use httpd; then
- exeinto /usr/libexec/ufdbguard
- doexe src/ufdbhttpd
- fi
-
- keepdir /usr/share/ufdbguard/blacklists
-
- insinto /etc
- doins src/ufdbGuard.conf
-
- insinto /usr/share/ufdbguard/images
- doins src/images/*
-
- newconfd "${FILESDIR}"/ufdb.confd ufdb
- newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
- fi
-}
-
-pkg_postinst() {
- elog "The default location for the blacklist database has been"
- elog "moved to /usr/share/ufdbguard/blacklists."
- elog ""
- elog "The configuration file is no longer configurable in the"
- elog "service file, and now resides at /etc/ufdbGuard.conf ."
- elog ""
- elog "The service script has been renamed from ufdbguad to simply"
- elog "/etc/init.d/ufdb, to follow the official documentation, and"
- elog "it gained a reload option with a reconfig alias."
- elog ""
- elog "You can configure the username and password parameters for"
- elog "ufdbUpdate, to fetch the blacklist database provided by"
- elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
- elog "the script itself."
- elog ""
- elog "To enable ufdbguard in squid, you should add this to your"
- elog "squid.conf:"
- elog ""
- elog " url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
- elog " url_rewrite_children 64"
- elog ""
- if ! use httpd; then
- elog "You chose to not install the lightweight http daemon that"
- elog "comes with ufdbguard."
- else
- elog "The ufdb service will start both the ufdbguardd daemon and"
- elog "the ufdbhttpd http daemon to provide a local redirect CGI."
- elog "If you don't want this to happen, disable the httpd USE flag."
- fi
- if use doc; then
- elog ""
- elog "The reference manual has been installed as"
- elog " /usr/share/doc/${PF}/ReferenceManual.pdf"
- fi
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.26.ebuild b/net-proxy/ufdbguard/ufdbguard-1.26.ebuild
deleted file mode 100644
index e58dff71c0b7..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.26.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.26.ebuild,v 1.2 2011/09/06 10:03:37 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-MY_P="ufdbGuard-${PV}"
-
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
-HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
- doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+httpd doc"
-
-RDEPEND="dev-libs/openssl
- app-arch/bzip2
- net-misc/wget"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-RDEPEND="${RDEPEND}
- sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # create the squid user exactly as done by net-proxy/squid-3.1.9
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
- epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
-
- egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
- sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
- || die
-
- # directory where ufdbhttpd is to be found
- sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
- src/ufdb.h.in || die
-}
-
-src_configure() {
- # better safe than sorry, the code has a number of possible
- # breakage, and at least one certain breakage.
- append-flags -fno-strict-aliasing
-
- econf \
- --with-ufdb-user=squid \
- --with-ufdb-config=/etc \
- --with-ufdb-logdir=/var/log/ufdbguard \
- --with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
- --with-ufdb-images_dir=/usr/share/ufdbguard/images
-}
-
-src_install() {
- dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
- doman doc/*.1
-
- dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
- src/ufdbConvertDB
- dosbin src/ufdbUpdate
-
- exeinto /usr/libexec/ufdbguard
- doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
-
- if use httpd; then
- exeinto /usr/libexec/ufdbguard
- doexe src/ufdbhttpd
- fi
-
- keepdir /usr/share/ufdbguard/blacklists
-
- insinto /etc
- doins src/ufdbGuard.conf
-
- insinto /usr/share/ufdbguard/images
- doins src/images/*
-
- newconfd "${FILESDIR}"/ufdb.confd ufdb
- newinitd "${FILESDIR}"/ufdb.initd ufdb
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
- fi
-}
-
-pkg_postinst() {
- elog "The default location for the blacklist database has been"
- elog "moved to /usr/share/ufdbguard/blacklists."
- elog ""
- elog "The configuration file is no longer configurable in the"
- elog "service file, and now resides at /etc/ufdbGuard.conf ."
- elog ""
- elog "The service script has been renamed from ufdbguad to simply"
- elog "/etc/init.d/ufdb, to follow the official documentation, and"
- elog "it gained a reload option with a reconfig alias."
- elog ""
- elog "You can configure the username and password parameters for"
- elog "ufdbUpdate, to fetch the blacklist database provided by"
- elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
- elog "the script itself."
- elog ""
- elog "To enable ufdbguard in squid, you should add this to your"
- elog "squid.conf:"
- elog ""
- elog " url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
- elog " url_rewrite_children 64"
- elog ""
- if ! use httpd; then
- elog "You chose to not install the lightweight http daemon that"
- elog "comes with ufdbguard."
- else
- elog "The ufdb service will start both the ufdbguardd daemon and"
- elog "the ufdbhttpd http daemon to provide a local redirect CGI."
- elog "If you don't want this to happen, disable the httpd USE flag."
- fi
- if use doc; then
- elog ""
- elog "The reference manual has been installed as"
- elog " /usr/share/doc/${PF}/ReferenceManual.pdf"
- fi
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.27.ebuild b/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
similarity index 97%
rename from net-proxy/ufdbguard/ufdbguard-1.27.ebuild
rename to net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
index 59b0e787db32..377363fb615c 100644
--- a/net-proxy/ufdbguard/ufdbguard-1.27.ebuild
+++ b/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.27.ebuild,v 1.1 2011/11/04 03:41:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild,v 1.1 2012/01/12 13:22:22 flameeyes Exp $
EAPI="4"
diff --git a/net-wireless/wimax/wimax-1.5.2-r1.ebuild b/net-wireless/wimax/wimax-1.5.2-r1.ebuild
index 2ea19dc136c9..1596b94dec92 100644
--- a/net-wireless/wimax/wimax-1.5.2-r1.ebuild
+++ b/net-wireless/wimax/wimax-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/wimax-1.5.2-r1.ebuild,v 1.2 2012/01/11 14:42:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/wimax-1.5.2-r1.ebuild,v 1.3 2012/01/12 17:49:12 alexxy Exp $
EAPI="4"
@@ -16,10 +16,10 @@ KEYWORDS="amd64 ~x86"
IUSE="static-libs"
DEPEND=">=dev-libs/libnl-1.1:1.1
- >=sys-kernel/linux-headers-2.6.34"
-RDEPEND="${DEPEND}
- net-wireless/wimax-tools
+ >=sys-kernel/linux-headers-2.6.34
net-wireless/wpa_supplicant[wimax]"
+RDEPEND="${DEPEND}
+ net-wireless/wimax-tools"
src_configure() {
econf \
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0bf6a4fd477f..7bbe811cb64c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5129,7 +5129,8 @@ x11-base/xorg-server:xnest - Build the Xnest server
x11-base/xorg-server:xorg - Build the Xorg X server (HIGHLY RECOMMENDED)
x11-base/xorg-server:xvfb - Build the Xvfb server
x11-drivers/ati-drivers:modules - Build the kernel modules
-x11-drivers/ati-drivers:opencl - Install OpenCL libraries
+x11-drivers/ati-drivers:opencl - Install OpenCL runtime libraries
+x11-drivers/ati-drivers:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
x11-drivers/ati-drivers:qt4 - Install qt4 dependent optional tools (e.g Catalyst Control Panel)
x11-drivers/xf86-video-geode:ztv - Enable building the V4L2 ZTV driver
x11-drivers/xf86-video-intel:sna - Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)
diff --git a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
index 65368d21e72c..3915ca59e17c 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.2.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/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.1 2012/01/11 04:11:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.2 2012/01/13 01:30:08 ottxor Exp $
EAPI=4
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.votca.org"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
gromacs? ( sci-chemistry/gromacs )
diff --git a/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch b/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch
new file mode 100644
index 000000000000..eeec55d4e8e6
--- /dev/null
+++ b/sci-chemistry/votca-csgapps/files/votca-csgapps-1.2.2-dso.patch
@@ -0,0 +1,266 @@
+# HG changeset patch
+# User Christoph Junghans
+# Date 1326307444 25200
+# Branch stable
+# Node ID 475999c2cd0d19f739e83c88b2df823c32730bc1
+# Parent 7e8f291a6d79da1ebbc512c370b8620714be0cb6
+cmake: make it DSO conform
+
+diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeLists.txt
+--- a/CMakeLists.txt Tue Jan 10 20:16:55 2012 -0700
++++ b/CMakeLists.txt Wed Jan 11 11:44:04 2012 -0700
+@@ -4,9 +4,42 @@
+
+ project(csgapps)
+
+-file(GLOB_RECURSE DIRS */CMakeLists.txt)
++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
++
++if(NOT CMAKE_BUILD_TYPE)
++ #Release comes with -O3 by default
++ set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
++endif(NOT CMAKE_BUILD_TYPE)
++
++enable_language(CXX)
++include(CheckCXXCompilerFlag)
++
++option(EXTERNAL_BOOST "Use external boost" ON)
++if (EXTERNAL_BOOST)
++ find_package(Boost 1.39.0 COMPONENTS program_options )
++ if(NOT Boost_FOUND)
++ message(FATAL_ERROR "Boost not found, make sure you have also installed boost and it's dev package or use our internal replacement, if you have built tools with -DEXTERNAL_BOOST=OFF and set it here as well")
++ endif(NOT Boost_FOUND)
++ include_directories(${Boost_INCLUDE_DIRS})
++ set (BOOST_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY})
++else(EXTERNAL_BOOST)
++ find_package(VOTCA_BOOST REQUIRED)
++ include_directories(${VOTCA_BOOST_INCLUDE_DIRS})
++ set (BOOST_LIBRARIES ${VOTCA_BOOST_LIBRARIES})
++endif(EXTERNAL_BOOST)
++
++find_package(VOTCA_TOOLS REQUIRED)
++include_directories(${VOTCA_TOOLS_INCLUDE_DIRS})
++find_package(VOTCA_CSG REQUIRED)
++include_directories(${VOTCA_CSG_INCLUDE_DIRS})
++
++file(GLOB_RECURSE DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */CMakeLists.txt)
+ foreach(DIR ${DIRS})
+- string(REGEX MATCH ^.*/ DIR ${DIR})
+- add_subdirectory(${DIR})
+- unset(NAME CACHE)
++ string(REGEX MATCH ^[^/]* DIR ${DIR})
++ file(GLOB SRC ${DIR}/*.cc)
++ add_executable(${DIR} ${SRC})
++ target_link_libraries(${DIR} ${VOTCA_CSG_LIBRARIES} ${VOTCA_TOOLS_LIBRARIES} ${BOOST_LIBRARIES})
++ install(TARGETS ${DIR} RUNTIME DESTINATION bin)
++ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DIR})
++ set_target_properties(${DIR} PROPERTIES OUTPUT_NAME ${DIR}/csg_${DIR})
+ endforeach(DIR)
+diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindSQLITE3.cmake
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/CMakeModules/FindSQLITE3.cmake Wed Jan 11 11:44:04 2012 -0700
+@@ -0,0 +1,36 @@
++# - Find libgmx
++# Find the native libgmx headers and libraries.
++#
++# SQLITE3_INCLUDE_DIRS - where to find sqlite3.h, etc
++# SQLITE3_LIBRARIES - List of libraries when using sqlite3.
++# SQLITE3_FOUND - True if sqlite3 found.
++#
++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_SQLITE3 sqlite3)
++
++find_path(SQLITE3_INCLUDE_DIR sqlite3.h HINTS ${PC_SQLITE3_INCLUDE_DIRS})
++find_library(SQLITE3_LIBRARY NAMES sqlite3 HINTS ${PC_SQLITE3_LIBRARY_DIRS} )
++
++set(SQLITE3_LIBRARIES "${SQLITE3_LIBRARY}" )
++set(SQLITE3_INCLUDE_DIRS "${SQLITE3_INCLUDE_DIR}" )
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR )
++
++mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY )
+diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_BOOST.cmake
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/CMakeModules/FindVOTCA_BOOST.cmake Wed Jan 11 11:44:04 2012 -0700
+@@ -0,0 +1,37 @@
++# - Find libvotca_boost
++# Find the native libvotca_boost headers and libraries.
++#
++# VOTCA_BOOST_INCLUDE_DIRS - where to find headers etc.
++# VOTCA_BOOST_LIBRARIES - List of libraries when using expat.
++# VOTCA_BOOST_FOUND - True if expat found.
++#
++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_VOTCA_BOOST libvotca_boost)
++find_path(VOTCA_BOOST_INCLUDE_DIR boost/algorithm/string/trim.hpp HINTS ${PC_VOTCA_BOOST_INCLUDE_DIRS} )
++find_library(VOTCA_BOOST_LIBRARY NAMES votca_boost HINTS ${PC_VOTCA_BOOST_LIBRARY_DIRS} )
++
++set(VOTCA_BOOST_LIBRARIES "${VOTCA_BOOST_LIBRARY}" )
++set(VOTCA_BOOST_INCLUDE_DIRS "${VOTCA_BOOST_INCLUDE_DIR}" )
++
++include(FindPackageHandleStandardArgs)
++# handle the QUIETLY and REQUIRED arguments and set VOTCA_BOOST_FOUND to TRUE
++# if all listed variables are TRUE
++find_package_handle_standard_args(VOTCA_BOOST DEFAULT_MSG VOTCA_BOOST_LIBRARY VOTCA_BOOST_INCLUDE_DIR)
++
++mark_as_advanced(VOTCA_BOOST_INCLUDE_DIR VOTCA_BOOST_LIBRARY )
+diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_CSG.cmake
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/CMakeModules/FindVOTCA_CSG.cmake Wed Jan 11 11:44:04 2012 -0700
+@@ -0,0 +1,51 @@
++# - Find libvotca_csg
++# Find the native libvotca_csg headers and libraries.
++#
++# VOTCA_CSG_INCLUDE_DIRS - where to find votca/csg/version.h, etc.
++# VOTCA_CSG_LIBRARIES - List of libraries when using expat.
++# VOTCA_CSG_FOUND - True if expat found.
++# VOTCA_CSG_HAS_SQLITE3 - True if votca csg was build with sqlite3 support
++#
++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_VOTCA_CSG libvotca_csg)
++find_path(VOTCA_CSG_INCLUDE_DIR votca/csg/version.h HINTS ${PC_VOTCA_CSG_INCLUDE_DIRS})
++
++find_library(VOTCA_CSG_LIBRARY NAMES votca_csg HINTS ${PC_VOTCA_CSG_LIBRARY_DIRS} )
++
++if("${VOTCA_CSG_LIBRARY}" MATCHES "libvotca_csg[^;]*\\.a")
++ if(PC_VOTCA_CSG_LIBRARIES)
++ list(REMOVE_ITEM PC_VOTCA_CSG_LIBRARIES votca_csg)
++ foreach (LIB ${PC_VOTCA_CSG_LIBRARIES})
++ find_library(VOTCA_CSG_${LIB} NAMES ${LIB} HINTS ${PC_VOTCA_CSG_LIBRARY_DIRS} )
++ list(APPEND VT_DEP_LIBRARIES ${VOTCA_CSG_${LIB}})
++ unset(VOTCA_CSG_${LIB} CACHE)
++ endforeach(LIB)
++ endif(PC_VOTCA_CSG_LIBRARIES)
++ set(VOTCA_CSG_DEP_LIBRARIES "${VT_DEP_LIBRARIES}" CACHE FILEPATH "votca csg depency libs (only needed for static (.a) libvotca_csg")
++endif("${VOTCA_CSG_LIBRARY}" MATCHES "libvotca_csg[^;]*\\.a")
++
++set(VOTCA_CSG_LIBRARIES "${VOTCA_CSG_LIBRARY};${VOTCA_CSG_DEP_LIBRARIES}" )
++set(VOTCA_CSG_INCLUDE_DIRS "${VOTCA_CSG_INCLUDE_DIR}" )
++
++include(FindPackageHandleStandardArgs)
++# handle the QUIETLY and REQUIRED arguments and set VOTCA_CSG_FOUND to TRUE
++# if all listed variables are TRUE
++find_package_handle_standard_args(VOTCA_CSG DEFAULT_MSG VOTCA_CSG_LIBRARY VOTCA_CSG_INCLUDE_DIR )
++
++mark_as_advanced(VOTCA_CSG_INCLUDE_DIR VOTCA_CSG_LIBRARY )
+diff -r 7e8f291a6d79 -r 475999c2cd0d CMakeModules/FindVOTCA_TOOLS.cmake
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/CMakeModules/FindVOTCA_TOOLS.cmake Wed Jan 11 11:44:04 2012 -0700
+@@ -0,0 +1,68 @@
++# - Find libvotca_tools
++# Find the native libvotca_tools headers and libraries.
++#
++# VOTCA_TOOLS_INCLUDE_DIRS - where to find votca/tools/version.h, etc.
++# VOTCA_TOOLS_LIBRARIES - List of libraries when using expat.
++# VOTCA_TOOLS_FOUND - True if expat found.
++# VOTCA_TOOLS_HAS_SQLITE3 - True if votca tools was build with sqlite3 support
++#
++# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++#
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_VOTCA_TOOLS libvotca_tools)
++find_path(VOTCA_TOOLS_INCLUDE_DIR votca/tools/version.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS})
++
++find_path(VOTCA_TOOLS_HAS_SQLITE3 votca/tools/database.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS})
++if (VOTCA_TOOLS_HAS_SQLITE3)
++ #due to include in database.h
++ find_package(SQLITE3 REQUIRED)
++ set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR}" )
++else(VOTCA_TOOLS_HAS_SQLITE3)
++ set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR}" )
++endif (VOTCA_TOOLS_HAS_SQLITE3)
++
++
++find_library(VOTCA_TOOLS_LIBRARY NAMES votca_tools HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} )
++
++if("${VOTCA_TOOLS_LIBRARY}" MATCHES "libvotca_tools[^;]*\\.a")
++ if(PC_VOTCA_TOOLS_LIBRARIES)
++ list(REMOVE_ITEM PC_VOTCA_TOOLS_LIBRARIES votca_tools)
++ foreach (LIB ${PC_VOTCA_TOOLS_LIBRARIES})
++ find_library(VOTCA_TOOLS_${LIB} NAMES ${LIB} HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} )
++ list(APPEND VT_DEP_LIBRARIES ${VOTCA_TOOLS_${LIB}})
++ unset(VOTCA_TOOLS_${LIB} CACHE)
++ endforeach(LIB)
++ endif(PC_VOTCA_TOOLS_LIBRARIES)
++ set(VOTCA_TOOLS_DEP_LIBRARIES "${VT_DEP_LIBRARIES}" CACHE FILEPATH "votca tools depency libs (only needed for static (.a) libvotca_tools")
++endif("${VOTCA_TOOLS_LIBRARY}" MATCHES "libvotca_tools[^;]*\\.a")
++
++set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" )
++
++include(FindPackageHandleStandardArgs)
++# handle the QUIETLY and REQUIRED arguments and set VOTCA_TOOLS_FOUND to TRUE
++# if all listed variables are TRUE
++find_package_handle_standard_args(VOTCA_TOOLS DEFAULT_MSG VOTCA_TOOLS_LIBRARY VOTCA_TOOLS_INCLUDE_DIR )
++
++if (VOTCA_TOOLS_FOUND)
++ include(CheckLibraryExists)
++ check_library_exists("${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" VotcaToolsFromC "" FOUND_VOTCA_TOOLS_VERSION)
++ if(NOT FOUND_VOTCA_TOOLS_VERSION)
++ message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so" -VOTCA_TOOLS_DEP_LIBRARIES="/path/to/libgsl.so;/path/to/libm.so') !")
++ endif(NOT FOUND_VOTCA_TOOLS_VERSION)
++endif (VOTCA_TOOLS_FOUND)
++
++mark_as_advanced(VOTCA_TOOLS_INCLUDE_DIR VOTCA_TOOLS_LIBRARY )
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
index 48a3ebe4bd1e..179d29224df5 100644
--- a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.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/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.1 2012/01/11 04:19:15 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.2 2012/01/13 01:27:50 ottxor Exp $
EAPI=4
@@ -28,3 +28,5 @@ RDEPEND="=sci-chemistry/${PN%apps}-${PV}"
DEPEND="${RDEPEND}"
DOCS=( README )
+
+PATCHES=( "${FILESDIR}/${P}-dso.patch" )
diff --git a/sci-libs/arprec/Manifest b/sci-libs/arprec/Manifest
index fb744650aa92..3f8afb4ef7a3 100644
--- a/sci-libs/arprec/Manifest
+++ b/sci-libs/arprec/Manifest
@@ -1,2 +1,3 @@
DIST arprec-2.2.2.tar.gz 517639 RMD160 a0170f94aac90a15c6d34414886f6f6d91e2136c SHA1 f9c7197bf725cfb9e0225beb27e208c503f79636 SHA256 6f813782bf5dab29314be54bf87a5c70910282fd87573cb5864b101993c8fc66
DIST arprec-2.2.7.tar.gz 689344 RMD160 6cf5cf21796e047daf1c50095f5f924c9f5465c2 SHA1 8a3f0f067b0cf17560af83ca84be233781a06b5c SHA256 cfe6475bb5e43879e3595a24dedc8010655ea9bde33e67ace2b17db5bd2d6da3
+DIST arprec-2.2.8.tar.gz 688846 RMD160 e45e1f7c529c2853b354de3d9e6606b359be9d79 SHA1 2a7b3e4a3525ddcdaedece01b43781ffd3301bf7 SHA256 750a223f52523a9518cdd050a6365c64f25e9a91cf8ec4469f07a8925eed1fc5
diff --git a/sci-libs/arprec/arprec-2.2.8.ebuild b/sci-libs/arprec/arprec-2.2.8.ebuild
new file mode 100644
index 000000000000..03a48b62fcb4
--- /dev/null
+++ b/sci-libs/arprec/arprec-2.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.8.ebuild,v 1.1 2012/01/13 04:35:53 bicatali Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 autotools
+
+DESCRIPTION="Arbitrary precision float arithmetics and functions"
+HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
+SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran qd static-libs"
+
+DEPEND="fortran? ( virtual/fortran )
+ qd? ( sci-libs/qd[fortran=] )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-autotools.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable fortran enable_fortran) \
+ $(use_enable qd enable_qd)
+}
+
+src_compile() {
+ emake
+ use fortran && emake toolkit
+}
+
+src_install() {
+ default
+ if use fortran; then
+ cd toolkit
+ ./mathinit || die "mathinit failed"
+ exeinto /usr/libexec/${PN}
+ doexe mathtool
+ insinto /usr/libexec/${PN}
+ doins *.dat
+ newdoc README README.mathtool
+ fi
+ use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
+}
diff --git a/sci-libs/arprec/files/arprec-2.2.8-autotools.patch b/sci-libs/arprec/files/arprec-2.2.8-autotools.patch
new file mode 100644
index 000000000000..af6d96960b18
--- /dev/null
+++ b/sci-libs/arprec/files/arprec-2.2.8-autotools.patch
@@ -0,0 +1,324 @@
+diff -Nur arprec-2.2.8.orig/arprec-config.in arprec-2.2.8/arprec-config.in
+--- arprec-2.2.8.orig/arprec-config.in 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/arprec-config.in 2012-01-13 04:23:40.000000000 +0000
+@@ -17,7 +17,7 @@
+ FC="@FC@"
+ FCLIBS="-L$libdir -larprecmod -larprec @LIBS@ @FCLIBS@"
+ FCFLAGS="@CONFIG_FCFLAGS@"
+-MODINC="@ax_f90_modflag@$libdir/arprec"
++MODINC="@ax_f90_modflag@$includedir/arprec"
+ FMAINLIB="-L$libdir -larprec_f_main"
+
+ configure_args="@CONFIGURE_ARGS@"
+diff -Nur arprec-2.2.8.orig/configure.ac arprec-2.2.8/configure.ac
+--- arprec-2.2.8.orig/configure.ac 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/configure.ac 2012-01-12 19:30:38.000000000 +0000
+@@ -233,8 +233,9 @@
+ AM_CONDITIONAL(HAVE_FORTRAN, [test "x$enable_fortran" = "xyes"])
+ AM_CONDITIONAL(UPCASE_MODULE, [test "$module_case" = "uppercase"])
+
+-# Check ranlib
+-AC_PROG_RANLIB
++# Check libtool (will check for ranlib and friends)
++AC_DISABLE_SHARED
++AC_PROG_LIBTOOL
+
+ # Checks for libraries.
+
+diff -Nur arprec-2.2.8.orig/fortran/Makefile.am arprec-2.2.8/fortran/Makefile.am
+--- arprec-2.2.8.orig/fortran/Makefile.am 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/fortran/Makefile.am 2012-01-13 00:06:20.000000000 +0000
+@@ -1,10 +1,10 @@
+ if HAVE_FORTRAN
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+-LDADD = libarprec_f_main.a libarprecmod.a $(top_builddir)/src/libarprec.a $(FCLIBS)
++LDADD = libarprec_f_main.la libarprecmod.la $(top_builddir)/src/libarprec.la $(FCLIBS)
+
+-lib_LIBRARIES = libarprecmod.a libarprec_f_main.a
+-libarprecmod_a_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f
+-libarprec_f_main_a_SOURCES = main.cpp
++lib_LTLIBRARIES = libarprecmod.la libarprec_f_main.la
++libarprecmod_la_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f
++libarprec_f_main_la_SOURCES = main.cpp
+
+ if UPCASE_MODULE
+ MPCOMPLEXMOD = MPCOMPLEXMOD.$(module_ext)
+@@ -29,15 +29,16 @@
+ MODULES = $(MPCOMPLEXMOD) $(MPDEFMOD) $(MPGENMOD) $(MPINTMOD) \
+ $(MPMODULE) $(MPMODULEM) $(MPMODULEX) $(MPREALMOD)
+
+-$(MPDEFMOD) $(MPINTMOD) $(MPREALMOD) $(MPCOMPLEXMOD) $(MPGENMOD) $(MPMODULE): mp_mod.o
++$(MPDEFMOD) $(MPINTMOD) $(MPREALMOD) $(MPCOMPLEXMOD) $(MPGENMOD) $(MPMODULE): mp_mod.lo
+
+-mp_modm.o: mp_mod.o
+-$(MPMODULEM): mp_modm.o
++mp_modm.lo: mp_mod.lo
++$(MPMODULEM): mp_modm.lo
+
+-mp_modx.o: mp_mod.o
+-$(MPMODULEX): mp_modx.o
++mp_modx.lo: mp_mod.lo
++$(MPMODULEX): mp_modx.lo
+
+-pkglib_DATA = $(MODULES)
++arprecmoddir = $(includedir)/arprec
++arprecmod_HEADERS = $(MODULES)
+
+ DEMO = pslq1$(EXEEXT) pslq2$(EXEEXT) pslq3$(EXEEXT) pslqm1$(EXEEXT) \
+ pslqm2$(EXEEXT) pslqm3$(EXEEXT) quadgs$(EXEEXT) quaderf$(EXEEXT) \
+diff -Nur arprec-2.2.8.orig/m4/ax_cxx_fma.m4 arprec-2.2.8/m4/ax_cxx_fma.m4
+--- arprec-2.2.8.orig/m4/ax_cxx_fma.m4 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/m4/ax_cxx_fma.m4 2012-01-12 23:13:06.000000000 +0000
+@@ -19,14 +19,14 @@
+ case $name in
+ ibm)
+ # IBM VisualAge C++ __fmadd / __fmsub.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ #include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ double x = __fmadd(1.0 + d, 1.0 - d, -1.0);
+ double y = __fmsub(1.0 + d, 1.0 - d, 1.0);
+ return (x == -d*d && y == -d*d) ? 0 : 1;
+- }],
++ }])],
+ [ax_cxx_fma="__fmadd(x,y,z)"
+ ax_cxx_fms="__fmsub(x,y,z)"
+ AC_DEFINE([ARPREC_VACPP_BUILTINS_H], [1],
+@@ -34,22 +34,22 @@
+ ;;
+ gnu)
+ # Later gcc (3.4 and later) have __builtin_fma that seems to work.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return (__builtin_fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="__builtin_fma(x,y,z)"
+ ax_cxx_fms="__builtin_fma(x,y,-z)"])
+ ;;
+ c99)
+ # Try C99 fma() function. Some platforms doesn't seem to implement this
+ # correctly (Apple gcc-3.3 for example).
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return (fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="fma(x,y,z)"
+ ax_cxx_fms="fma(x,y,-z)"])
+ ;;
+@@ -57,11 +57,11 @@
+ # Try relying on the compiler to optimize x * y + z into an fma.
+ # This method is not recommended since if it is inlined it does not
+ # always produce the same correct code.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return ( (1.0 + d) * (1.0 - d) - 1.0 == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="((x)*(y) + (z))"
+ ax_cxx_fms="((x)*(y) - (z))"])
+ ;;
+diff -Nur arprec-2.2.8.orig/m4/ax_f90_module_flag.m4 arprec-2.2.8/m4/ax_f90_module_flag.m4
+--- arprec-2.2.8.orig/m4/ax_f90_module_flag.m4 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/m4/ax_f90_module_flag.m4 2012-01-12 23:11:22.000000000 +0000
+@@ -16,7 +16,7 @@
+
+ AC_DEFUN([AX_F90_MODULE_FLAG],[
+ AC_CACHE_CHECK([fortran 90 modules inclusion flag],
+-ax_f90_modflag,
++ax_cv_f90_modflag,
+ [AC_LANG_PUSH(Fortran)
+ i=0
+ while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
+@@ -24,24 +24,24 @@
+ done
+ mkdir tmpdir_$i
+ cd tmpdir_$i
+-AC_COMPILE_IFELSE([module conftest_module
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
+ contains
+ subroutine conftest_routine
+ write(*,'(a)') 'gotcha!'
+ end subroutine conftest_routine
+ end module conftest_module
+- ],[],[])
++ ])],[],[])
+ cd ..
+ ax_f90_modflag="not found"
+ for ax_flag in "-I " "-M" "-p"; do
+ if test "$ax_f90_modflag" = "not found" ; then
+ ax_save_FCFLAGS="$FCFLAGS"
+ FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i"
+- AC_COMPILE_IFELSE([program conftest_program
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([program conftest_program
+ use conftest_module
+ call conftest_routine
+ end program conftest_program
+- ],[ax_f90_modflag="$ax_flag"],[])
++ ])],[ax_f90_modflag="$ax_flag"],[])
+ FCFLAGS="$ax_save_FCFLAGS"
+ fi
+ done
+diff -Nur arprec-2.2.8.orig/m4/ax_f90_module_style.m4 arprec-2.2.8/m4/ax_f90_module_style.m4
+--- arprec-2.2.8.orig/m4/ax_f90_module_style.m4 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/m4/ax_f90_module_style.m4 2012-01-12 23:11:22.000000000 +0000
+@@ -21,7 +21,7 @@
+
+ AC_DEFUN([AX_F90_MODULE_STYLE],[
+ AC_CACHE_CHECK([fortran 90 modules naming style],
+-ax_f90_module_style,
++ax_cv_f90_module_style,
+ [AC_LANG_PUSH(Fortran)
+ i=0
+ while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
+@@ -29,13 +29,13 @@
+ done
+ mkdir tmpdir_$i
+ cd tmpdir_$i
+-AC_COMPILE_IFELSE([module conftest_module
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
+ contains
+ subroutine conftest_routine
+ write(*,'(a)') 'gotcha!'
+ end subroutine conftest_routine
+ end module conftest_module
+- ],
++ ])],
+ [ax_f90_modext=`ls | sed -n 's,conftest_module\.,,p'`
+ if test x$ax_f90_modext = x ; then
+ dnl Some F90 compilers put module filename in uppercase letters
+diff -Nur arprec-2.2.8.orig/m4/ax_fc_backslash_flag.m4 arprec-2.2.8/m4/ax_fc_backslash_flag.m4
+--- arprec-2.2.8.orig/m4/ax_fc_backslash_flag.m4 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/m4/ax_fc_backslash_flag.m4 2012-01-12 23:13:50.000000000 +0000
+@@ -11,9 +11,9 @@
+ if test "x$ax_flag" != "xnone"; then
+ FCFLAGS="$save_FCFLAGS $ax_flag"
+ fi
+- AC_COMPILE_IFELSE([[program test
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([program test
+ print *, '\'
+- end program]], [ax_fc_backslash_flag=$ax_flag])
++ end program])], [ax_fc_backslash_flag=$ax_flag])
+ fi
+ done
+ AC_LANG_POP(Fortran)
+diff -Nur arprec-2.2.8.orig/m4/ax_fc_etime.m4 arprec-2.2.8/m4/ax_fc_etime.m4
+--- arprec-2.2.8.orig/m4/ax_fc_etime.m4 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/m4/ax_fc_etime.m4 2012-01-12 23:11:22.000000000 +0000
+@@ -4,9 +4,9 @@
+ ax_fc_etime=
+ ax_fc_etime_names="etime etime_"
+ for name in $ax_fc_etime_names; do
+- AC_LINK_IFELSE([AC_LANG_PROGRAM(, [[
++ AC_LINK_IFELSE([AC_LANG_PROGRAM(, [AC_LANG_SOURCE([
+ real*4 t(2), tot
+- tot = $name(t)]])],
++ tot = $name(t)])])],
+ [ax_fc_etime=$name], [])
+ if test "x$ax_fc_etime" != "x"; then
+ break;
+diff -Nur arprec-2.2.8.orig/Makefile.am arprec-2.2.8/Makefile.am
+--- arprec-2.2.8.orig/Makefile.am 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/Makefile.am 2012-01-12 23:53:09.000000000 +0000
+@@ -2,21 +2,20 @@
+ SUBDIRS = src tests include fortran toolkit
+
+ bin_SCRIPTS=arprec-config
+-docdir=${datadir}/doc/${PACKAGE}
+ dist_doc_DATA = README doc/arprec.pdf
+
+ cpp-demo:
+- cd tests && make demo
++ $(MAKE) -C tests demo
+
+ if HAVE_FORTRAN
+
+ fortran-demo:
+- cd fortran && make demo
++ $(MAKE) -C fortran demo
+
+ demo: fortran-demo cpp-demo
+
+ toolkit:
+- cd toolkit && make toolkit
++ $(MAKE) -C toolkit toolkit
+
+ else
+
+@@ -31,7 +30,7 @@
+ endif
+
+ time:
+- cd tests && make time
++ $(MAKE) -C tests time
+
+ changelog:
+ git log >ChangeLog
+diff -Nur arprec-2.2.8.orig/src/Makefile.am arprec-2.2.8/src/Makefile.am
+--- arprec-2.2.8.orig/src/Makefile.am 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/src/Makefile.am 2012-01-12 19:20:48.000000000 +0000
+@@ -13,9 +13,9 @@
+ dble.cpp \
+ small_inline.h
+
+-lib_LIBRARIES = libarprec.a
++lib_LTLIBRARIES = libarprec.la
+
+-libarprec_a_SOURCES = $(SRC)
++libarprec_la_SOURCES = $(SRC)
+
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+
+diff -Nur arprec-2.2.8.orig/tests/Makefile.am arprec-2.2.8/tests/Makefile.am
+--- arprec-2.2.8.orig/tests/Makefile.am 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/tests/Makefile.am 2012-01-12 19:20:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-LDADD = $(top_builddir)/src/libarprec.a
++LDADD = $(top_builddir)/src/libarprec.la
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+
+ TESTS = mp_test c_mp_test io
+diff -Nur arprec-2.2.8.orig/toolkit/Makefile.am arprec-2.2.8/toolkit/Makefile.am
+--- arprec-2.2.8.orig/toolkit/Makefile.am 2012-01-12 19:17:33.000000000 +0000
++++ arprec-2.2.8/toolkit/Makefile.am 2012-01-13 04:29:03.000000000 +0000
+@@ -1,9 +1,9 @@
+ if HAVE_FORTRAN
+ AM_CPPFLAGS=-I$(top_builddir)
+ AM_FFLAGS=@ax_f90_modflag@$(top_builddir)/fortran
+-LDADD = $(top_builddir)/fortran/libarprec_f_main.a \
+- $(top_builddir)/fortran/libarprecmod.a \
+- $(top_builddir)/src/libarprec.a $(FCLIBS)
++LDADD = $(top_builddir)/fortran/libarprec_f_main.la \
++ $(top_builddir)/fortran/libarprecmod.la \
++ $(top_builddir)/src/libarprec.la $(FCLIBS)
+
+ TOOLKIT = mathinit$(EXEEXT) mathtool$(EXEEXT)
+ EXTRA_PROGRAMS = $(TOOLKIT)
+@@ -19,6 +19,18 @@
+ nodist_mathtool_SOURCES = second.f
+ nodist_EXTRA_mathtool_SOURCES = dummy.cpp
+ mathtool_LINK = $(CXXLINK)
++if UPCASE_MODULE
++GLOBDATAMOD = GLOBDATA.$(module_ext)
++else
++GLOBDATAMOD = globdata.$(module_ext)
++endif
++$(GLOBDATAMOD): globdata.o
++mathinit.o: $(GLOBDATAMOD)
++mathtool.o: $(GLOBDATAMOD)
++pqlsub.o: $(GLOBDATAMOD)
++rootsub.o: $(GLOBDATAMOD)
++quadsub.o: $(GLOBDATAMOD)
++zetapz.o: $(GLOBDATAMOD)
+
+ toolkit: $(TOOLKIT)
+
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index c99949a55b15..d167fcc8e99f 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,2 +1 @@
-DIST CCfits-2.2.tar.gz 1752775 RMD160 0d3a5a999da0dcef36535a7cbba476cd6253bb3b SHA1 87c243e95ccc4897a13523d115aa1bd80f962f3f SHA256 dd145d037ed020aa5d05458d569e127431b45d83a8445ee99a35f18633e3c2fb
-DIST CCfits-2.3.tar.gz 1735742 RMD160 fd060e67bc66200b393728021245e59ae9e87c56 SHA1 09be985ef43294a7516542af57e6c0c5f766c7bf SHA256 e3e9e770e61d0c575c9bc1e23c1e8d3d7d27801a22ea32d24e615e469d6a826b
+DIST CCfits-2.4.tar.gz 1792643 RMD160 5dc64feed35498886316e8fd5603cf4d558f3e84 SHA1 3de2a6379bc1024300befae95cfdf33645a7b64a SHA256 ba6c5012b260adf7633f92581279ea582e331343d8c973981aa7de07242bd7f8
diff --git a/sci-libs/ccfits/ccfits-2.2.ebuild b/sci-libs/ccfits/ccfits-2.2.ebuild
deleted file mode 100644
index 8ec7af07377f..000000000000
--- a/sci-libs/ccfits/ccfits-2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ccfits-2.2.ebuild,v 1.1 2010/01/20 02:32:36 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MYPN=CCfits
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=sci-libs/cfitsio-3.080"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-src_prepare() {
- # avoid building cookbook by default and no rpath
- epatch "${FILESDIR}"/${P}-makefile.patch
- AT_M4DIR=config/m4 eautoreconf
-}
-
-src_test() {
- emake check || die
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc CHANGES
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins *.pdf || die
- doins -r html || die
- fi
-}
diff --git a/sci-libs/ccfits/ccfits-2.3.ebuild b/sci-libs/ccfits/ccfits-2.4.ebuild
similarity index 61%
rename from sci-libs/ccfits/ccfits-2.3.ebuild
rename to sci-libs/ccfits/ccfits-2.4.ebuild
index c08be2d06084..64e98b3137f1 100644
--- a/sci-libs/ccfits/ccfits-2.3.ebuild
+++ b/sci-libs/ccfits/ccfits-2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ccfits-2.3.ebuild,v 1.1 2010/11/24 20:11:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ccfits-2.4.ebuild,v 1.1 2012/01/13 04:46:20 bicatali Exp $
-EAPI=2
+EAPI=4
inherit eutils autotools
MYPN=CCfits
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
RDEPEND=">=sci-libs/cfitsio-3.080"
DEPEND="${RDEPEND}"
@@ -28,12 +28,11 @@ src_prepare() {
AT_M4DIR=config/m4 eautoreconf
}
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc CHANGES
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins *.pdf || die
- doins -r html || die
- fi
+ default
+ use doc && dodoc *.pdf && dohtml -r html/*
}
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 659aa9fb99ce..be6bc143c09d 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,2 +1,3 @@
DIST qd-2.3.11.tar.gz 700309 RMD160 44d858feba1190845ff17e1f2e54afc4c0643c62 SHA1 9f66ceb4a0d5373e8f02c783ceaa2d653114c6eb SHA256 0bbd376c45c6c8572fc86f9ed8a477f560b78dd5c0a9f63b6db1f46263c67970
+DIST qd-2.3.12.tar.gz 700145 RMD160 daecff500f9f88fe5fe50eabffadd7b69b8ad12f SHA1 78ca159be52337d923b70cea1789d03d344fd663 SHA256 e13b99a3b2ff7f8a56a5fcdf1b238270d1581750ab23fef8eb386e63c0e04ff5
DIST qd-2.3.9.tar.gz 595952 RMD160 782b27a13654d9d132a6f9f885d8ad176e1e1fda SHA1 d7a0c6fd3854dbed5204b8e4fa7d0ad8801be717 SHA256 080021d9d88d0ac5ca74c2c472c271367e44570fead8a05aa939549870cab768
diff --git a/sci-libs/qd/files/qd-2.3.12-autotools.patch b/sci-libs/qd/files/qd-2.3.12-autotools.patch
new file mode 100644
index 000000000000..1389c519712e
--- /dev/null
+++ b/sci-libs/qd/files/qd-2.3.12-autotools.patch
@@ -0,0 +1,438 @@
+diff -Nur qd-2.3.12.orig/configure.ac qd-2.3.12/configure.ac
+--- qd-2.3.12.orig/configure.ac 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/configure.ac 2012-01-13 04:15:47.000000000 +0000
+@@ -308,12 +308,11 @@
+ AC_SUBST(FFLAGS, $FCFLAGS)
+
+ # Add libraries
+-LIBS="$LIBS -lm"
++AC_CHECK_LIB(m,sqrt)
+
+ # libtool stuff
+-# AC_DISABLE_SHARED
+-# AC_PROG_LIBTOOL
+-AC_PROG_RANLIB
++AC_DISABLE_SHARED
++AC_PROG_LIBTOOL
+
+ # Output
+ AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile
+diff -Nur qd-2.3.12.orig/fortran/Makefile.am qd-2.3.12/fortran/Makefile.am
+--- qd-2.3.12.orig/fortran/Makefile.am 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/fortran/Makefile.am 2012-01-13 04:15:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ if HAVE_FORTRAN
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+-LDADD=libqdmod.a libqd_f_main.a $(top_builddir)/src/libqd.a $(FCLIBS)
++LDADD=libqdmod.la libqd_f_main.la $(top_builddir)/src/libqd.la $(FCLIBS)
+
+ if UPCASE_MODULE
+ DDEXT=DDEXT.$(module_ext)
+@@ -14,17 +14,18 @@
+ DDMOD=ddmodule.$(module_ext)
+ endif
+
+-lib_LIBRARIES = libqdmod.a libqd_f_main.a
+-libqdmod_a_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
+-libqd_f_main_a_SOURCES = main.cpp
+-ddmod.o: ddext.o
+-qdmod.o: ddmod.o qdext.o
+-$(QDMOD): qdmod.o
+-$(DDMOD): ddmod.o
+-$(DDEXT): ddext.o
+-$(QDEXT): qdext.o
++lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
++libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
++libqd_f_main_la_SOURCES = main.cpp
++ddmod.lo: $(DDEXT) ddext.lo
++qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
++$(QDMOD): qdmod.lo $(DDMOD)
++$(DDMOD): ddmod.lo
++$(DDEXT): ddext.lo
++$(QDEXT): qdext.lo $(DDEXT)
+
+-pkglib_DATA = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT)
++qdmoddir = $(includedir)/$(PACKAGE)
++qdmod_HEADERS = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT)
+
+ DEMO=quaderq$(EXEEXT) quadgsq2d$(EXEEXT) quadgsq$(EXEEXT) \
+ quadtsq$(EXEEXT) quadtsq2d$(EXEEXT)
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4 qd-2.3.12/m4/ax_cxx_clock_gettime.m4
+--- qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_clock_gettime.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -3,13 +3,13 @@
+ AC_DEFUN([AX_CXX_CLOCK_GETTIME], [
+ AC_MSG_CHECKING([for clock_gettime useability])
+ AC_LANG_PUSH(C++)
+-AC_COMPILE_IFELSE([
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include
+ int main() {
+ struct timespec tv;
+ return clock_gettime(CLOCK_REALTIME, &tv);
+ }
+-], [ax_cxx_clock_gettime="yes"], [ax_cxx_clock_gettime="no"])
++])], [ax_cxx_clock_gettime="yes"], [ax_cxx_clock_gettime="no"])
+ AC_LANG_POP(C++)
+ AC_MSG_RESULT([$ax_cxx_clock_gettime])
+ ])
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_copysign.m4 qd-2.3.12/m4/ax_cxx_copysign.m4
+--- qd-2.3.12.orig/m4/ax_cxx_copysign.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_copysign.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -6,19 +6,19 @@
+ AC_MSG_CHECKING([for copysign])
+ AC_LANG_PUSH(C++)
+ ax_cxx_copysign=
+-AC_COMPILE_IFELSE([#include
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ std::copysign(1.0, 1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(std::copysign)
+ ax_cxx_copysign="std::copysign(x, y)"])
+ if test "x$ax_cxx_copysign" = "x"; then
+- AC_COMPILE_IFELSE([#include
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ ::copysign(1.0, 1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(::copysign)
+ ax_cxx_copysign="::copysign(x, y)"],
+ [AC_MSG_RESULT(none)
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_fma.m4 qd-2.3.12/m4/ax_cxx_fma.m4
+--- qd-2.3.12.orig/m4/ax_cxx_fma.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_fma.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -19,14 +19,14 @@
+ case $name in
+ ibm)
+ # IBM VisualAge C++ __fmadd / __fmsub.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ #include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ double x = __fmadd(1.0 + d, 1.0 - d, -1.0);
+ double y = __fmsub(1.0 + d, 1.0 - d, 1.0);
+ return (x == -d*d && y == -d*d) ? 0 : 1;
+- }],
++ }])],
+ [ax_cxx_fma="__fmadd(x,y,z)"
+ ax_cxx_fms="__fmsub(x,y,z)"
+ AC_DEFINE([QD_VACPP_BUILTINS_H], [1],
+@@ -34,11 +34,11 @@
+ ;;
+ gnu)
+ # Later gcc (3.4 and later) have __builtin_fma that seems to work.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return (__builtin_fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="__builtin_fma(x,y,z)"
+ ax_cxx_fms="__builtin_fma(x,y,-z)"])
+ ;;
+@@ -46,22 +46,22 @@
+ # Intel and HP compilers for IA 64 architecture seems to have
+ # _Asm_fma/fms macros. Not much documentation is available for
+ # these...
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return (_Asm_fma(2, 1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="_Asm_fma(2, x,y,z)"
+ ax_cxx_fms="_Asm_fms(2, x,y,z)"])
+ ;;
+ c99)
+ # Try C99 fma() function. Some platforms doesn't seem to implement this
+ # correctly (Apple gcc-3.3 for example).
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return (fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="fma(x,y,z)"
+ ax_cxx_fms="fma(x,y,-z)"])
+ ;;
+@@ -69,11 +69,11 @@
+ # Try relying on the compiler to optimize x * y + z into an fma.
+ # This method is not recommended since if it is inlined it does not
+ # always produce the same correct code.
+- AC_RUN_IFELSE([#include
++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ double d = std::ldexp(1.0, -52);
+ return ( (1.0 + d) * (1.0 - d) - 1.0 == -d*d ? 0 : 1);
+- }],
++ }])],
+ [ax_cxx_fma="((x)*(y) + (z))"
+ ax_cxx_fms="((x)*(y) - (z))"])
+ ;;
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_isfinite.m4 qd-2.3.12/m4/ax_cxx_isfinite.m4
+--- qd-2.3.12.orig/m4/ax_cxx_isfinite.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isfinite.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -6,19 +6,19 @@
+ AC_MSG_CHECKING([for isfinite])
+ AC_LANG_PUSH(C++)
+ ax_cxx_isfinite=
+-AC_COMPILE_IFELSE([#include
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ std::isfinite(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(std::isfinite)
+ ax_cxx_isfinite="std::isfinite(x)"])
+ if test "x$ax_cxx_isfinite" = "x"; then
+- AC_COMPILE_IFELSE([#include
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ ::isfinite(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(::isfinite)
+ ax_cxx_isfinite="::isfinite(x)"],
+ [AC_MSG_RESULT(none)
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_isinf.m4 qd-2.3.12/m4/ax_cxx_isinf.m4
+--- qd-2.3.12.orig/m4/ax_cxx_isinf.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isinf.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -6,19 +6,19 @@
+ AC_MSG_CHECKING([for isinf])
+ AC_LANG_PUSH(C++)
+ ax_cxx_isinf=
+-AC_COMPILE_IFELSE([#include
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ std::isinf(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(std::isinf)
+ ax_cxx_isinf="std::isinf(x)"])
+ if test "x$ax_cxx_isinf" = "x"; then
+- AC_COMPILE_IFELSE([#include
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ ::isinf(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(::isinf)
+ ax_cxx_isinf="::isinf(x)"],
+ [AC_MSG_RESULT(none)
+diff -Nur qd-2.3.12.orig/m4/ax_cxx_isnan.m4 qd-2.3.12/m4/ax_cxx_isnan.m4
+--- qd-2.3.12.orig/m4/ax_cxx_isnan.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isnan.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -6,19 +6,19 @@
+ AC_MSG_CHECKING([for isnan])
+ AC_LANG_PUSH(C++)
+ ax_cxx_isnan=
+-AC_COMPILE_IFELSE([#include
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ std::isnan(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(std::isnan)
+ ax_cxx_isnan="std::isnan(x)"])
+ if test "x$ax_cxx_isnan" = "x"; then
+- AC_COMPILE_IFELSE([#include
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include
+ int main() {
+ ::isnan(1.0);
+ return 0;
+- }],
++ }])],
+ [AC_MSG_RESULT(::isnan)
+ ax_cxx_isnan="::isnan(x)"],
+ [AC_MSG_RESULT(none)
+diff -Nur qd-2.3.12.orig/m4/ax_f90_module_flag.m4 qd-2.3.12/m4/ax_f90_module_flag.m4
+--- qd-2.3.12.orig/m4/ax_f90_module_flag.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_f90_module_flag.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -16,7 +16,7 @@
+
+ AC_DEFUN([AX_F90_MODULE_FLAG],[
+ AC_CACHE_CHECK([fortran 90 modules inclusion flag],
+-ax_f90_modflag,
++ax_cv_f90_modflag,
+ [AC_LANG_PUSH(Fortran)
+ i=0
+ while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
+@@ -24,24 +24,24 @@
+ done
+ mkdir tmpdir_$i
+ cd tmpdir_$i
+-AC_COMPILE_IFELSE([module conftest_module
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
+ contains
+ subroutine conftest_routine
+ write(*,'(a)') 'gotcha!'
+ end subroutine conftest_routine
+ end module conftest_module
+- ],[],[])
++ ])],[],[])
+ cd ..
+ ax_f90_modflag="not found"
+ for ax_flag in "-I " "-M" "-p"; do
+ if test "$ax_f90_modflag" = "not found" ; then
+ ax_save_FCFLAGS="$FCFLAGS"
+ FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i"
+- AC_COMPILE_IFELSE([program conftest_program
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([program conftest_program
+ use conftest_module
+ call conftest_routine
+ end program conftest_program
+- ],[ax_f90_modflag="$ax_flag"],[])
++ ])],[ax_f90_modflag="$ax_flag"],[])
+ FCFLAGS="$ax_save_FCFLAGS"
+ fi
+ done
+diff -Nur qd-2.3.12.orig/m4/ax_f90_module_style.m4 qd-2.3.12/m4/ax_f90_module_style.m4
+--- qd-2.3.12.orig/m4/ax_f90_module_style.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_f90_module_style.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -21,7 +21,7 @@
+
+ AC_DEFUN([AX_F90_MODULE_STYLE],[
+ AC_CACHE_CHECK([fortran 90 modules naming style],
+-ax_f90_module_style,
++ax_cv_f90_module_style,
+ [AC_LANG_PUSH(Fortran)
+ i=0
+ while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
+@@ -29,13 +29,13 @@
+ done
+ mkdir tmpdir_$i
+ cd tmpdir_$i
+-AC_COMPILE_IFELSE([module conftest_module
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
+ contains
+ subroutine conftest_routine
+ write(*,'(a)') 'gotcha!'
+ end subroutine conftest_routine
+ end module conftest_module
+- ],
++ ])],
+ [ax_f90_modext=`ls | sed -n 's,conftest_module\.,,p'`
+ if test x$ax_f90_modext = x ; then
+ dnl Some F90 compilers put module filename in uppercase letters
+diff -Nur qd-2.3.12.orig/m4/ax_fc_etime.m4 qd-2.3.12/m4/ax_fc_etime.m4
+--- qd-2.3.12.orig/m4/ax_fc_etime.m4 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_fc_etime.m4 2012-01-13 04:15:47.000000000 +0000
+@@ -4,9 +4,9 @@
+ ax_fc_etime=
+ ax_fc_etime_names="etime etime_"
+ for name in $ax_fc_etime_names; do
+- AC_LINK_IFELSE([AC_LANG_PROGRAM(, [[
++ AC_LINK_IFELSE([AC_LANG_PROGRAM(, [AC_LANG_SOURCE([
+ real*4 t(2), tot
+- tot = $name(t)]])],
++ tot = $name(t)])])],
+ [ax_fc_etime=$name], [])
+ if test "x$ax_fc_etime" != "x"; then
+ break;
+diff -Nur qd-2.3.12.orig/Makefile.am qd-2.3.12/Makefile.am
+--- qd-2.3.12.orig/Makefile.am 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/Makefile.am 2012-01-13 04:15:47.000000000 +0000
+@@ -1,7 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = config src include tests fortran
+
+-docdir=${datadir}/doc/${PACKAGE}
+ BUILT_SOURCES = docs/qd.pdf
+ dist_doc_DATA = README docs/qd.pdf
+ dist_noinst_DATA = docs/Makefile \
+@@ -24,7 +23,7 @@
+ doc: docs/qd.pdf
+
+ docs/qd.pdf:
+- cd docs && $(MAKE) qd.pdf
++ $(MAKE) -C docsqd.pdf
+
+ changelog:
+ git log >ChangeLog
+@@ -33,12 +32,12 @@
+ rm -f ${distdir}/ChangeLog && git log >${distdir}/ChangeLog
+
+ cpp-demo:
+- cd tests && make demo
++ $(MAKE) -C tests demo
+
+ if HAVE_FORTRAN
+
+ fortran-demo:
+- cd fortran && make demo
++ $(MAKE) -C fortran demo
+
+ demo: cpp-demo fortran-demo
+
+@@ -52,7 +51,7 @@
+ endif
+
+ time:
+- cd tests && make time
++ $(MAKE) -C tests time
+
+ bin_SCRIPTS=qd-config
+
+diff -Nur qd-2.3.12.orig/qd-config.in qd-2.3.12/qd-config.in
+--- qd-2.3.12.orig/qd-config.in 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/qd-config.in 2012-01-13 04:17:47.000000000 +0000
+@@ -30,7 +30,7 @@
+ FCLIBS="-L$libdir -lqdmod -lqd @LIBS@ @FCLIBS@"
+ FMAINLIB="-L$libdir -lqd_f_main"
+ FCFLAGS="@REQ_FCFLAGS@"
+-MODFLAG="@ax_f90_modflag@$libdir/qd"
++MODFLAG="@ax_f90_modflag@$includedir/qd"
+
+ build="@BUILDER@-@BUILDDATE@"
+ configure_args="@CONFIGURE_ARGS@"
+diff -Nur qd-2.3.12.orig/src/Makefile.am qd-2.3.12/src/Makefile.am
+--- qd-2.3.12.orig/src/Makefile.am 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/src/Makefile.am 2012-01-13 04:15:47.000000000 +0000
+@@ -1,9 +1,9 @@
+ SRC = c_dd.cpp c_qd.cpp dd_real.cpp dd_const.cpp \
+ fpu.cpp qd_real.cpp qd_const.cpp util.cpp bits.cpp util.h
+
+-lib_LIBRARIES = libqd.a
++lib_LTLIBRARIES = libqd.la
+
+-libqd_a_SOURCES = $(SRC)
++libqd_la_SOURCES = $(SRC)
+
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+
+diff -Nur qd-2.3.12.orig/tests/Makefile.am qd-2.3.12/tests/Makefile.am
+--- qd-2.3.12.orig/tests/Makefile.am 2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/tests/Makefile.am 2012-01-13 04:15:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-LDADD = $(top_builddir)/src/libqd.a
++LDADD = $(top_builddir)/src/libqd.la
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+
+ TESTS = qd_test pslq_test c_test
+@@ -15,9 +15,9 @@
+
+ f_test_SOURCES = f_test.f
+ f_test_LINK=$(CXXLINK)
+-f_test_LDADD = $(top_builddir)/fortran/libqdmod.a \
+- $(top_builddir)/fortran/libqd_f_main.a \
+- $(LDADD) $(top_builddir)/src/libqd.a $(FCLIBS)
++f_test_LDADD = $(top_builddir)/fortran/libqdmod.la \
++ $(top_builddir)/fortran/libqd_f_main.la \
++ $(LDADD) $(top_builddir)/src/libqd.la $(FCLIBS)
+ endif
+
+ CLEANFILES=qd_timer quadt_test huge
diff --git a/sci-libs/qd/qd-2.3.12.ebuild b/sci-libs/qd/qd-2.3.12.ebuild
new file mode 100644
index 000000000000..5d669e3bc015
--- /dev/null
+++ b/sci-libs/qd/qd-2.3.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.12.ebuild,v 1.1 2012/01/12 22:53:04 bicatali Exp $
+
+EAPI=4
+
+inherit autotools eutils fortran-2
+
+DESCRIPTION="Quad-double and double-double float arithmetics"
+HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
+SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran static-libs"
+
+DEPEND="fortran? ( virtual/fortran )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-autotools.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable fortran enable_fortran)
+}
+
+src_install() {
+ default
+ use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
+ dosym qd_real.h /usr/include/qd/qd.h
+ dosym dd_real.h /usr/include/qd/dd.h
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 776c60d79cfe..450b6c378db4 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,4 +1,3 @@
DIST openrc-0.8.3.tar.bz2 162474 RMD160 51728d13abaf10df0309f20efb5181cf46c71277 SHA1 41f86cf964cf90c1db26e7d7521ee784b706494b SHA256 38ce2538bffe38c00055aadb85597f6f517b3e9f760dc1ed4a27ddf28cb9f4b4
DIST openrc-0.9.4.tar.bz2 163514 RMD160 b0c5b10a562b7a906d762f9b735aa386be6c4afa SHA1 a44f0606db29b6aa2cf98c1907c915e8da5acf4f SHA256 0da3981de88c16b24d14b37d4d2eb0f631cbe5ebe3058dd8c2e32f7092937ae3
-DIST openrc-0.9.7.tar.bz2 164329 RMD160 665a9a49676b04d4ce76db597266de43f4907ec2 SHA1 08df99ef314e9bd8f4724a00d714f718db0708c5 SHA256 47f4406b85a11611472f6916c283f3dce6e5a77f32f3af815cd3d71b73c9fae6
DIST openrc-0.9.8.tar.bz2 166082 RMD160 526d838538e7fb9e7c1d4e7d8c5bded9a019c4af SHA1 ffc180283327aa7d55026ee8bcdd546228dc1cb7 SHA256 6bfaac2d432f177fc544297ebdca55840d595990ef381c97544a2dc298680eda
diff --git a/sys-apps/openrc/openrc-0.9.7.ebuild b/sys-apps/openrc/openrc-0.9.7.ebuild
deleted file mode 100644
index 7a51712dbd7e..000000000000
--- a/sys-apps/openrc/openrc-0.9.7.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.7.ebuild,v 1.2 2011/12/14 17:18:20 williamh Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
-[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
-inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
-if [[ ${PV} != "9999" ]] ; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
- elibc_glibc? ( >=sys-libs/glibc-2.5 )
- ncurses? ( sys-libs/ncurses )
- pam? ( sys-auth/pambase )
- >=sys-apps/baselayout-2.0.0
- kernel_linux? (
- !