diff --git a/app-admin/apache-tools/apache-tools-2.4.4.ebuild b/app-admin/apache-tools/apache-tools-2.4.4.ebuild
index 9c452bc7fa38..5c9530b52f58 100644
--- a/app-admin/apache-tools/apache-tools-2.4.4.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.4.ebuild,v 1.2 2013/03/04 09:00:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.4.ebuild,v 1.5 2013/03/04 18:21:22 ranger Exp $
EAPI="3"
inherit flag-o-matic eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"
diff --git a/app-admin/eselect-renpy/eselect-renpy-0.2.ebuild b/app-admin/eselect-renpy/eselect-renpy-0.2.ebuild
new file mode 100644
index 000000000000..d4e80eb3972f
--- /dev/null
+++ b/app-admin/eselect-renpy/eselect-renpy-0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-renpy/eselect-renpy-0.2.ebuild,v 1.1 2013/03/04 16:00:53 hasufell Exp $
+
+EAPI=5
+
+inherit games
+
+DESCRIPTION="Manages renpy symlink"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/eselect-lib-bin-symlink"
+
+S=${WORKDIR}
+
+pkg_setup() { :; }
+
+src_prepare() {
+ sed \
+ -e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
+ "${FILESDIR}"/renpy.eselect-${PV} > "${WORKDIR}"/renpy.eselect || die
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins renpy.eselect
+}
+
+pkg_preinst() { :; }
+
+pkg_postinst() { :; }
diff --git a/app-admin/eselect-renpy/files/renpy.eselect-0.2 b/app-admin/eselect-renpy/files/renpy.eselect-0.2
new file mode 100644
index 000000000000..54d3c4c57006
--- /dev/null
+++ b/app-admin/eselect-renpy/files/renpy.eselect-0.2
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: renpy.eselect-0.2,v 1.1 2013/03/04 16:00:53 hasufell Exp $
+
+DESCRIPTION="Manage default renpy version"
+MAINTAINER="hasufell@gentoo.org"
+VERSION="0.2"
+
+SYMLINK_PATH="@GAMES_BINDIR@/renpy"
+SYMLINK_TARGETS=( renpy-6.14 renpy-6.15 )
+SYMLINK_DESCRIPTION='default renpy'
+SYMLINK_CRUCIAL=1
+
+inherit bin-symlink
+
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index 9db56bc586ef..42fa0bea261a 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -9,6 +9,7 @@
kensington@gentoo.org
Proxy maintainer. CC him on bugs.
+ proxy-maintainers
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 9e50e132d684..bba98292808e 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1 +1,2 @@
DIST advancecomp-1.15.tar.gz 259340 SHA256 0d235c78224d450666bdd852a301159d53b9570e9cd28f015e222797ba4d5fe1 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba WHIRLPOOL 34b44dd464092f442d5b9945e97abb4cd6fee1363c61df7573792d6a315cdab64197653b63c545b55587f37da7353e68d4cc3e26cbad961e700729b0a3f76aa2
+DIST advancecomp-1.16.tar.gz 280510 SHA256 de5617d561935f41522f04e332d9db01f910c2acb3eb231d2fb0774a86539bc0 SHA512 51e80758bb290a59b1d2faaccd7b0ead18ce6abfd85e47a57d3123e80334fe0676d4e6ec82496c228db4aef46a18050409811c7f74c833b7aa52bc57ff4aaae5 WHIRLPOOL 90e1c5c2c48dde3d9646691a92188ff28f58fd11a1e632492882e190a7090364d8bc9018e219d55eb5cf67e69e4bd54edbd4c5ac012afa556fdeb03acd8721ec
diff --git a/app-arch/advancecomp/advancecomp-1.16.ebuild b/app-arch/advancecomp/advancecomp-1.16.ebuild
new file mode 100644
index 000000000000..bf39545efe5a
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-1.16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.16.ebuild,v 1.1 2013/03/04 15:49:35 jer Exp $
+
+EAPI=5
+
+DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
+HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="png mng"
+
+DEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" #282441
+
+src_configure() {
+ econf --enable-bzip2
+}
+
+src_install() {
+ dobin advdef advzip
+
+ if use png; then
+ dobin advpng
+ doman doc/advpng.1
+ fi
+
+ if use mng; then
+ dobin advmng
+ doman doc/advmng.1
+ fi
+
+ dodoc HISTORY AUTHORS README
+ doman doc/advdef.1 doc/advzip.1
+}
diff --git a/app-cdr/kcdemu/Manifest b/app-cdr/kcdemu/Manifest
index 3980edd585ae..edab6be761b4 100644
--- a/app-cdr/kcdemu/Manifest
+++ b/app-cdr/kcdemu/Manifest
@@ -1 +1,2 @@
DIST 99752-kde_cdemu-0.4.tar.bz2 12469 SHA256 d869e1f8214cc50b0ac475eb204729d8d3a68baf6b1b74cf650bf98e1f08ffc5 SHA512 3b5466b1abac4ce8cc3741bc8c183cc8d39d79ff7d823519523c41818c6ebf9e2a2735de775476e9f3737bbfad5632ba0d44439ef3cff3d78c07416588df91e9 WHIRLPOOL 9f54e450d61ca9def7c40514dcb99fac99a5b8766abde51304f9505a9148d84c78ac7bd1c9077dd8e050e8e09be311c368bac87bc15809877eb7c99740be07c4
+DIST kcdemu-0.5.0.tar.gz 12251 SHA256 d93744048cf7ae6b86861d26e2c38c27fafd4a7d6e5703e03ed09d776273303a SHA512 25d81e466647456a28f0a100b16fc5c19a62119e08b3149a15dc653f3693993a3caaaadbb5a37f4a29c38cff0fb06efc1cc6faaf3a0817c85bd6ae2f99009926 WHIRLPOOL 5998b8a62011377d8961712f7fd523c9a1e505ec832262f22e0aa8ca74e0a943f150cd2dda01c788fdb1ecd97fad505f4a8d6b7ba53c6ab08a8d22e166c4ae87
diff --git a/app-cdr/kcdemu/kcdemu-0.5.0.ebuild b/app-cdr/kcdemu/kcdemu-0.5.0.ebuild
new file mode 100644
index 000000000000..66db88cccfd1
--- /dev/null
+++ b/app-cdr/kcdemu/kcdemu-0.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/kcdemu-0.5.0.ebuild,v 1.1 2013/03/04 14:56:44 kensington Exp $
+
+EAPI=5
+KDE_LINGUAS="de es pl ro sv"
+MY_PN="kde_cdemu"
+
+inherit kde4-base
+
+DESCRIPTION="A frontend to cdemu daemon for KDE4"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/99752-${MY_PN}-${PV}.tar.bz2 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=app-cdr/cdemu-2.0.0[cdemu-daemon]"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( ChangeLog )
diff --git a/app-emulation/wine/wine-1.5.25.ebuild b/app-emulation/wine/wine-1.5.25.ebuild
index abf87d736c3b..6fad5f81dd19 100644
--- a/app-emulation/wine/wine-1.5.25.ebuild
+++ b/app-emulation/wine/wine-1.5.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.25.ebuild,v 1.1 2013/03/03 08:15:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.25.ebuild,v 1.2 2013/03/04 15:44:18 tetromino Exp $
EAPI="5"
@@ -108,7 +108,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
- app-emulation/emul-linux-x86-baselibs[development]
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development]
>=sys-kernel/linux-headers-2.6
)
)"
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index b5d28168d151..3ffa33cf5694 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.136 2013/03/03 08:15:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.137 2013/03/04 15:44:18 tetromino Exp $
EAPI="5"
@@ -108,7 +108,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
- app-emulation/emul-linux-x86-baselibs[development]
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development]
>=sys-kernel/linux-headers-2.6
)
)"
diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index 6715a97f4615..502130557ff2 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,3 +1,4 @@
DIST scim-tables-0.5.10.tar.gz 8101380 SHA256 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea SHA512 e58247e2ac2dd08b497ce32648d4f6c173a320cb2d69ef18cc2a24a4be6312e9920b3ac71b82de4412d383f04eaf7e7f667c46e93977638c614a374dc0d0efbb WHIRLPOOL 753dbd4119584477ce87fccbe108b0b77675c1e53f241e1ba3d29137c3c914b6d1d2af726f325a126b1ada09eb1de3228202972fff0bf00793ba19304f039b51
DIST scim-tables-0.5.11.tar.gz 6757581 SHA256 e7ce3c3fc73eb37c00385db278050100dc4fd51437bfba828185b7b28a7ab88f SHA512 1dbd34c66c800596971dd57109c648e572de7e4956a95be73638b3ddca970aeeb948325c3f9eaddee58e6925e09849073a72873edc8b3df6d53ae10071494b0d WHIRLPOOL f15b91b6ad17dad5ef2d462709571b788cdba39047bfffae2be4abc84b49c71fe745a04f62ca714a869fafc09704b0383e8e18ff680064ba2a63ff45be73d9d0
+DIST scim-tables-0.5.12.tar.gz 6714368 SHA256 10b5f97331229c22fe76dfde093d87b04333f9d43af654a603e583901e677511 SHA512 5e624a060c29bf2ac1f349aefe5dce7ea8edfa47a753ec57589859c30759120cc3c2521038bc7de0f7e6ba25c2c91750b849ede8c1d8303cbcbfb2fff65f0730 WHIRLPOOL affb1ef264b2d679c55f4be6c9b6cc161d2a67cd301791c1c7aebefc6ec57f575463ce3c573a3b76faf7158811e45d63eec708dc7d4ae4635b921d1194632d3f
DIST scim-tables-0.5.8.tar.gz 7214866 SHA256 2710b54f92845510b9db57b46c64a716c256e36585d55d51a62fdd3113572490 SHA512 af3c83cb4116dd5b3acdd81f99cc9705385c7bce4b1911da3acbabd2c5009063d656949642ccaa14d4fedf44d69644df26cd67c4b47a726853b43704fc87943b WHIRLPOOL 10f8dd3a86b3f613fca7b2da73308e881cc2e100f39b0930538b8cf5fae7f9d3ef0f75f3e5b4ac6217e770ffe47cb76fd5d2f306af930f8a46b67b13afcceed5
diff --git a/app-i18n/scim-tables/scim-tables-0.5.12.ebuild b/app-i18n/scim-tables/scim-tables-0.5.12.ebuild
new file mode 100644
index 000000000000..19f71a8b5419
--- /dev/null
+++ b/app-i18n/scim-tables/scim-tables-0.5.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.12.ebuild,v 1.1 2013/03/04 10:48:09 naota Exp $
+
+inherit autotools base eutils
+
+DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
+for i in ${LANGS} ; do
+ IUSE="${IUSE} linguas_${i}"
+done
+
+RDEPEND=">=app-i18n/scim-1.4.7-r2
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch" )
+
+pkg_setup() {
+ elog "Not all languages are going to be compiled."
+ elog "Please set LINGUAS to your preferred language(s)."
+ elog "Supported LINGUAS values are:"
+ elog "${LANGS}"
+}
+
+src_unpack() {
+ base_src_unpack
+
+ strip-linguas ${LANGS}
+ local use_languages="additional ${LINGUAS}"
+ elog "Languages being compiled are: ${use_languages}"
+
+ cd "${S}"
+ sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
+ tables/Makefile.{am,in} || die "sed ${m} failed"
+
+ AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
+}
+
+src_compile() {
+ econf \
+ --disable-skim-support \
+ $(use_enable nls) \
+ --disable-static \
+ --disable-dependency-tracking \
+ --without-arts || die "econf failed"
+ emake || die "make failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ dodoc README ChangeLog AUTHORS
+}
diff --git a/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
index 84eb34ff1be7..a3993f2fc2f7 100644
--- a/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild,v 1.3 2013/03/02 19:43:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild,v 1.4 2013/03/04 18:08:16 kensington Exp $
-EAPI=4
-KDE_REQUIRED="never"
+EAPI=5
+KDE_REQUIRED="optional"
+KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
KDE_LINGUAS_DIR="po"
-KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr zh_CN zh_TW"
-inherit fdo-mime qt4-r2 kde4-base eutils
-DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
+inherit base eutils fdo-mime qt4-r2 kde4-base
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt."
HOMEPAGE="http://www.kchmviewer.net/"
SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
@@ -19,9 +20,10 @@ IUSE="debug kde"
RDEPEND="
dev-libs/chmlib
- >=dev-qt/qtdbus-4.5:4
- >=dev-qt/qtwebkit-4.5:4
- !kde? ( >=dev-qt/qtgui-4.5:4 )
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ dev-qt/qtwebkit:4
kde? (
$(add_kdebase_dep kdelibs)
!kde-base/okular[chm]
@@ -65,24 +67,20 @@ src_compile() {
if use kde; then
kde4-base_src_compile
else
- emake || die
+ default
fi
}
-src_test() {
- einfo "No tests exist."
-}
-
src_install() {
if use kde; then
kde4-base_src_install
else
- dobin bin/kchmviewer || die "dobin kchmviewer failed"
- domenu packages/kchmviewer.desktop || die
- dodoc ChangeLog README || die
+ dobin bin/kchmviewer
+ domenu packages/kchmviewer.desktop
+ dodoc ChangeLog README
fi
- doicon packages/kchmviewer.png || die
- dodoc DBUS-bindings FAQ || die
+ doicon packages/kchmviewer.png
+ dodoc DBUS-bindings FAQ
}
pkg_postinst() {
diff --git a/app-text/landslide/landslide-1.1.1.ebuild b/app-text/landslide/landslide-1.1.1.ebuild
index e97a54c96b09..b70a847cd5e1 100644
--- a/app-text/landslide/landslide-1.1.1.ebuild
+++ b/app-text/landslide/landslide-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/landslide/landslide-1.1.1.ebuild,v 1.1 2012/11/20 08:37:38 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/landslide/landslide-1.1.1.ebuild,v 1.2 2013/03/04 11:55:17 nimiux Exp $
EAPI=3
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/adamzap/landslide/tarball/v${PV} -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
DEPEND=""
diff --git a/app-text/lv/files/lv-4.51-tinfo.patch b/app-text/lv/files/lv-4.51-tinfo.patch
new file mode 100644
index 000000000000..9c17a92a65ef
--- /dev/null
+++ b/app-text/lv/files/lv-4.51-tinfo.patch
@@ -0,0 +1,22 @@
+diff --git a/src/configure.in b/src/configure.in
+index 7d118de..29833a7 100644
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -24,7 +24,16 @@ AC_ARG_ENABLE(purify,
+ dnl Checks for libraries.
+ AC_DEFINE(UNIX)
+ AC_DEFINE(TERMCAP)
+-AC_CHECK_LIB(terminfo, tgetstr,, [AC_CHECK_LIB(termcap, tgetstr,, [AC_CHECK_LIB(ncurses, tgetstr,, [AC_CHECK_LIB(curses, tgetstr)])])])
++PKG_CHECK_MODULES(
++ CURSES,
++ ncurses,
++ [
++ CPPFLAGS="$CURSES_CFLAGS $CPPFLAGS"
++ LIBS="$CURSES_LIBS $LIBS"
++ ],
++ [
++ AC_CHECK_LIB(terminfo, tgetstr,, [AC_CHECK_LIB(termcap, tgetstr,, [AC_CHECK_LIB(ncurses, tgetstr,, [AC_CHECK_LIB(curses, tgetstr)])])])
++ ])
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
index 8860be27fbc2..e965cc275f96 100644
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.7 2012/09/18 03:12:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.8 2013/03/04 10:55:57 naota Exp $
EAPI="4"
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
MY_P="${PN}${PV//./}"
@@ -26,6 +26,8 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
epatch "${FILESDIR}"/${P}-xz.diff
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+ cd "${S}"/src; eautoreconf
}
src_configure() {
diff --git a/app-text/multitail/files/multitail-5.2.12-as-needed.patch b/app-text/multitail/files/multitail-5.2.12-as-needed.patch
new file mode 100644
index 000000000000..1ec5ba2c26b5
--- /dev/null
+++ b/app-text/multitail/files/multitail-5.2.12-as-needed.patch
@@ -0,0 +1,26 @@
+--- Makefile.old 2009-07-02 20:16:52.561919791 +0200
++++ Makefile 2009-07-02 20:17:21.947666469 +0200
+@@ -4,19 +4,19 @@ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+
+ DEBUG=-g # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
+ # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -rdynamic
+
+ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
+
+ all: multitail
+
+ multitail: $(OBJS)
+- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ multitail_ccmalloc: $(OBJS)
+- ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o ccmultitail $(LIBS)
+
+ install: multitail
+ cp multitail $(DESTDIR)/usr/bin
diff --git a/app-text/multitail/multitail-5.2.12.ebuild b/app-text/multitail/multitail-5.2.12.ebuild
index 9140f9f7bce8..2f433b39f209 100644
--- a/app-text/multitail/multitail-5.2.12.ebuild
+++ b/app-text/multitail/multitail-5.2.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.12.ebuild,v 1.2 2013/02/25 19:07:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.12.ebuild,v 1.3 2013/03/04 18:58:11 jlec Exp $
EAPI=5
@@ -15,19 +15,21 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE="debug doc examples"
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/5.2.2-as-needed.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
sed -e '/gcc/d' -i Makefile || die
+
+ tc-export CC PKG_CONFIG
}
src_configure() {
- tc-export CC
use debug && append-flags "-D_DEBUG"
use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 86fde75f0a57..09a3678f24dc 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,8 +1,10 @@
DIST php-5.3.18.tar.bz2 11335289 SHA256 f065deecb78abb8ef101e1098866024af4ca10cb30139608c9a18e40236f1a2f SHA512 39b9532b65b86737ad825c76c42551840707c7eee311af7307bfbb1a41f7533ff6afec07fc9c3d42c8684aa08d814118ae3ff020b25fab1faaf1229e0ab9568d WHIRLPOOL 480916325f4e05ed4f7d4b40a62c6c8966111abdab687a74772749f9291991797106b39d74b9a00984eeb70b28096059032c77439d38a2e1467f2362e46ebd79
DIST php-5.3.20.tar.bz2 11358034 SHA256 578c26e6932dd7a37ff14e4e2237bc3235386fe897ba2e456e937e647727cd07 SHA512 1f3282cef5d553f28324b8f011acef59319441a8a258355b908fb6f69eaad8f1d736dc03259ddc168c20332510b7c73b5afb21934d3d14cb4f893f5cee59bd9b WHIRLPOOL 7e41bea91aec20a371b1e5a0de7e76f3e34d2b51c0378e76155c101297ac3811c9f0ced43abe911e64f812ca8130dd9cfc27090f29beb5cfaec1957de0f3d38e
DIST php-5.3.21.tar.bz2 11362683 SHA256 9bd914cb01fc78c06ec5fe7e31100f000cc03325e042fd5a829d8ce80e4478c3 SHA512 e6896a1646d9c6cd40446ec4c374c948120ed38e9bfc067354f342888b29cfe794e689ef56aaa714ea469061915bf78507c3adb6d69057132b9baaf44443a09f WHIRLPOOL c9e7bdf3744d22498e8deb014bd51ea76c897d7acf3735fc8fc7f8c0ef64994f66459461650562b2b15c7fc8534f70c6805b5e5226a9c3da359b0b7418623350
+DIST php-5.3.22.tar.bz2 11366482 SHA256 2da5fefdd24dafd8a94b6e41ba2c308ee216f97b3d605abde513d0cdc680d588 SHA512 ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7 WHIRLPOOL 2d0300c47e920db5227f225ffd266fbf4ca8303feb60b397ab95e0c8ed5e70c2c7d5868cf3fb9cbb201e894552b868a6d82147d0f11817403329d64f0d1c757a
DIST php-5.4.10.tar.bz2 11145757 SHA256 c5bffda2154aedd9851c1e9b7da66f6c44c199716bd202054dd5d4a4f5f997e4 SHA512 2d8074dba24776113be208fa354c839168ce138b407ca45ed2334f91a54aff041f34280a87fb9e64ce29638047a48d481c384ffbf19cc0b5eb88aa39aba5beb4 WHIRLPOOL 2f39f62f618d4752031ddba98b95c7d00e7ac71318dd87ed0a1bc162a9b0d8383d376a8038598a0c2c291bb4f8421c84aa74c2eca6e8c173e60a8a51950b7c8c
DIST php-5.4.11.tar.bz2 11147685 SHA256 d4d095a965f015896d25321842da586076aca5fed4c52939866548ebad5b0fdb SHA512 fa50acb9498c9d33993d5f0722f2f2b32aa4e04a40e8adab47b4aa31943fc6df9c1edbcccffcd897b4c7635dcdf37d417f9b6c05fc3b2962e495b6f0f5776867 WHIRLPOOL fe4bf5f602e38581bb5201a9f50cc7686e5a0154809ececebe7317474ecadd879a8d7f7641ec80649b9970955208539a2f9b98d4bf66446ae333c499ec2df850
+DIST php-5.4.12.tar.bz2 11501953 SHA256 413e5036b2784918922c14e094cbbc6f28289a3e8e559479c688ab07027ef719 SHA512 c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21 WHIRLPOOL 1cf1153f006e1db472d435d344286cc702ab5fab6b3564d981be3406acfb7bdcd7b43ed3536581c2c1f7ea1389b04bb3c5c00814a082cc4c616fbe7b0b13eb77
DIST php-5.4.8.tar.bz2 11056057 SHA256 d02810b7949938ee7190116e7483e1a06b3fa8373d3bbc0ea65a41265afce79f SHA512 e04ee08e7d1b6f80183846206d02576ad22ea3f41e956bab970344b195f1d2267f1ff69439988cea7084c18576d7855383e48094bdb7684d43cb0f78e4a5e7b8 WHIRLPOOL 963153d85236bd105cbf11a89dd0db11e590cc292bb499abaa9271dbb47eeb124ef011af9561cb5569840d32130934c70cd8ebb4d619147892044ab8c3be09bd
DIST php-5.5.0alpha2.tar.bz2 11572909 SHA256 d618f8f570e3d29fff8f581a1e4228e9c0e3e51ecc6a295621863181822d913c SHA512 24dc24998aa8ecd29075f0c7b8f67b732e9b1aa7a36576a0b1536ff479679e8fb8c78681644be42d5ca948b20ec0a58a14c57f30c888a432daf7a0f5ab582e78 WHIRLPOOL e962d168091c65c957fb1df75cd64349a74e9cab7fc66efa2ab514d44b49bd5a7e28152c9c4e189390dfaff0925ab75583cf0c0286aa14397b8dabc1ced75848
DIST php-5.5.0alpha4.tar.bz2 11998221 SHA256 6e6000343338bda5f759c4745e0326d2495164779d13c86e7eaa43e4e0503837 SHA512 6fe1acdd5e01fb7c1c411a3abc6b2ea2fbaf894c41e3e457aebd2b0047ee9240194fa125f85bb977ddc773fd5c518216f3d40531d5ac05fadea0d0dc2be45288 WHIRLPOOL b5c5931a4cfc10d4be1be70b5042ef860262e1f40d725ceb4ba54613d8a699507cee7768f850cb78eb8ecf055d9a2f7970b30fcf9e12c5781cc89ee5c06cd93a
diff --git a/dev-lang/php/php-5.3.22.ebuild b/dev-lang/php/php-5.3.22.ebuild
new file mode 100644
index 000000000000..fa56fdd42506
--- /dev/null
+++ b/dev-lang/php/php-5.3.22.ebuild
@@ -0,0 +1,912 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.22.ebuild,v 1.1 2013/03/04 11:45:07 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+SUHOSIN_VERSION=""
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+
+function php_get_uri ()
+{
+ case "${1}" in
+ "php-pre")
+ echo "http://downloads.php.net/johannes/${2}"
+ ;;
+ "php")
+ echo "http://www.php.net/distributions/${2}"
+ ;;
+ "suhosin")
+ echo "http://download.suhosin.org/${2}"
+ ;;
+ "olemarkus")
+ echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+ ;;
+ "gentoo")
+ echo "mirror://gentoo/${2}"
+ ;;
+ *)
+ die "unhandled case in php_get_uri"
+ ;;
+ esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+ $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
+ # in some cases we use our own suhosin patch (very recent version,
+ # patch conflicts, etc.)
+ SUHOSIN_TYPE="olemarkus"
+else
+ SUHOSIN_TYPE="suhosin"
+fi
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+ SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+ SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+ ${PHP_SRC_URI}
+ ${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+ SRC_URI="${SRC_URI}
+ suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# Gentoo-specific, common features
+IUSE="kolab"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} 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 selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite2 sqlite ssl
+ sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+ +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
+
+DEPEND="!dev-lang/php:5
+ >=app-admin/eselect-php-0.6.2
+ >=dev-libs/libpcre-8.12[unicode]
+ apache2? ( www-servers/apache[threads=] )
+ berkdb? ( =sys-libs/db-4* )
+ bzip2? ( app-arch/bzip2 )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ cjk? ( !gd? (
+ virtual/jpeg
+ media-libs/libpng
+ sys-libs/zlib
+ ) )
+ crypt? ( >=dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ exif? ( !gd? (
+ virtual/jpeg
+ media-libs/libpng
+ sys-libs/zlib
+ ) )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gmp? ( >=dev-libs/gmp-4.1.2 )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ kolab? ( >=net-libs/c-client-2004g-r1 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ !mysqlnd? (
+ mysql? ( virtual/mysql )
+ mysqli? ( >=virtual/mysql-4.1 )
+ )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql-base )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite2? ( =dev-db/sqlite-2* )
+ sqlite? ( >=dev-db/sqlite-3.7.7.1 )
+ ssl? ( >=dev-libs/openssl-0.9.7 )
+ sybase-ct? ( dev-db/freetds )
+ tidy? ( app-text/htmltidy )
+ truetype? (
+ =media-libs/freetype-2*
+ >=media-libs/t1lib-5.0.0
+ !gd? (
+ virtual/jpeg media-libs/libpng sys-libs/zlib )
+ )
+ unicode? ( dev-libs/oniguruma )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? (
+ x11-libs/libXpm
+ virtual/jpeg
+ media-libs/libpng sys-libs/zlib
+ )
+ xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib )
+ virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+ 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 ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+ sys-devel/flex
+ >=sys-devel/m4-1.4.3
+ >=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+ production|development)
+ ;;
+ *)
+ PHP_INI_VERSION="development"
+ ;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+ depend.apache_pkg_setup
+}
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+ cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "apache2" ]] ; then
+ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+ newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+ "70_mod_php${PHP_MV}.conf"
+ fi
+
+ if [[ "${sapi}" == "fpm" ]] ; then
+ [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
+ [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+ einfo "Installing FPM CGI config file php-fpm.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+ dodir "/etc/init.d"
+ insinto "/etc/init.d"
+ newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
+ # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
+
+ # Remove bogus /etc/php-fpm.conf.default (bug 359906)
+ [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+ fi
+
+ # Install PHP ini files into /usr/share/php
+
+ dodoc php.ini-development
+ dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+ # ([empty session.save_path]/session_mm_[sapi][gid].sem)
+ # there is no easy way to circumvent that, all php calls during
+ # install use -n, so no php.ini file will be used.
+ # As such, this is the easiest way to get around
+ addpredict /session_mm_cli250.sem
+ addpredict /session_mm_cli0.sem
+
+ # kolab support (support for imap annotations)
+ use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch"
+
+ # Change PHP branding
+ sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
+ -i configure.in || die "Unable to change PHP branding"
+
+ # Apply generic PHP patches
+ EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+ # Patch PHP to show Gentoo as the server platform
+ sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+ -i configure.in || die "Failed to fix server platform name"
+
+ # Prevent PHP from activating the Apache config,
+ # as we will do that ourselves
+ sed -i \
+ -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+ # Patch PHP to support heimdal instead of mit-krb5
+ if has_version "app-crypt/heimdal" ; then
+ sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+ || die "Failed to fix heimdal libname"
+ sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+ || die "Failed to fix heimdal crypt library reference"
+ fi
+
+ # Suhosin support
+ if [[ -n $SUHOSIN_VERSION ]] ; then
+ if use suhosin ; then
+ epatch "${WORKDIR}/${SUHOSIN_PATCH}"
+ fi
+ else
+ ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
+ fi
+
+ #Add user patches #357637
+ epatch_user
+
+ # rebuild the whole autotools stuff as we are heavily patching it
+ # (suhosin, fastbuild, ...)
+
+ # eaclocal doesn't accept --force, so we try to force re-generation
+ # this way
+ rm aclocal.m4
+
+ # work around divert() issues with newer autoconf, bug #281697
+ if has_version '>=sys-devel/autoconf-2.64' ; then
+ sed -i -r \
+ -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+ $(grep -l divert $(find . -name '*.m4') configure.in) || die
+ fi
+ eautoreconf --force -W no-cross
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
+
+ # This is a global variable and should be in caps. It isn't because the
+ # phpconfutils eclass relies on exactly this name...
+ # for --with-libdir see bug #327025
+ my_conf="--prefix=${PHP_DESTDIR}
+ --mandir=${PHP_DESTDIR}/man
+ --infodir=${PHP_DESTDIR}/info
+ --libdir=${PHP_DESTDIR}/lib
+ --with-libdir=$(get_libdir)
+ --without-pear
+ $(use_enable threads maintainer-zts)"
+
+ # extension USE flag shared
+ my_conf+="
+ $(use_enable bcmath bcmath )
+ $(use_with bzip2 bz2 )
+ $(use_enable calendar calendar )
+ $(use_enable ctype ctype )
+ $(use_with curl curl )
+ $(use_with curlwrappers curlwrappers )
+ $(use_enable xml dom )
+ $(use_with enchant enchant /usr)
+ $(use_enable exif exif )
+ $(use_enable fileinfo fileinfo )
+ $(use_enable filter filter )
+ $(use_enable ftp ftp )
+ $(use_with nls gettext )
+ $(use_with gmp gmp )
+ $(use_enable hash hash )
+ $(use_with mhash mhash )
+ $(use_with iconv iconv )
+ $(use_enable intl intl )
+ $(use_enable ipv6 ipv6 )
+ $(use_enable json json )
+ $(use_with kerberos kerberos /usr)
+ $(use_enable xml libxml )
+ $(use_enable unicode mbstring )
+ $(use_with crypt mcrypt )
+ $(use_with mssql mssql )
+ $(use_with unicode onig /usr)
+ $(use_with ssl openssl )
+ $(use_with ssl openssl-dir /usr)
+ $(use_enable pcntl pcntl )
+ $(use_enable phar phar )
+ $(use_enable pdo pdo )
+ $(use_with postgres pgsql )
+ $(use_enable posix posix )
+ $(use_with spell pspell )
+ $(use_with recode recode )
+ $(use_enable simplexml simplexml )
+ $(use_enable sharedmem shmop )
+ $(use_with snmp snmp )
+ $(use_enable soap soap )
+ $(use_enable sockets sockets )"
+ if version_is_at_least 5.3.16-r2; then
+ my_conf+=" $(use_with sqlite2 sqlite /usr) "
+ use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
+ else
+ my_conf+=" $(use_with sqlite sqlite /usr) "
+ use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
+ fi
+ my_conf+="
+ $(use_with sqlite sqlite3 /usr)
+ $(use_with sybase-ct sybase-ct /usr)
+ $(use_enable sysvipc sysvmsg )
+ $(use_enable sysvipc sysvsem )
+ $(use_enable sysvipc sysvshm )
+ $(use_with tidy tidy )
+ $(use_enable tokenizer tokenizer )
+ $(use_enable wddx wddx )
+ $(use_enable xml xml )
+ $(use_enable xmlreader xmlreader )
+ $(use_enable xmlwriter xmlwriter )
+ $(use_with xmlrpc xmlrpc )
+ $(use_with xsl xsl )
+ $(use_enable zip zip )
+ $(use_with zlib zlib )
+ $(use_enable debug debug )"
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ my_conf="${my_conf} --enable-dba${shared}"
+ fi
+
+ # DBA drivers support
+ my_conf+="
+ $(use_with cdb cdb )
+ $(use_with berkdb db4 )
+ $(use_enable flatfile flatfile )
+ $(use_with gdbm gdbm )
+ $(use_enable inifile inifile )
+ $(use_with qdbm qdbm )"
+
+ # Support for the GD graphics library
+ my_conf+="
+ $(use_with truetype freetype-dir /usr)
+ $(use_with truetype t1lib /usr)
+ $(use_enable cjk gd-jis-conv )
+ $(use_with gd jpeg-dir /usr)
+ $(use_with gd png-dir /usr)
+ $(use_with xpm xpm-dir /usr)"
+ # enable gd last, so configure can pick up the previous settings
+ my_conf+="
+ $(use_with gd gd )"
+
+ # IMAP support
+ if use imap ; then
+ my_conf+="
+ $(use_with imap imap )
+ $(use_with ssl imap-ssl )"
+ fi
+
+ # Interbase/firebird support
+
+ if use firebird ; then
+ my_conf+="
+ $(use_with firebird interbase /usr)"
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ my_conf+="
+ $(use_with ldap ldap )
+ $(use_with ldap-sasl ldap-sasl )"
+ fi
+
+ # MySQL support
+ if use mysql ; then
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysqlnd mysql mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysql mysql /usr)"
+ fi
+ my_conf+="
+ $(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
+ fi
+
+ # MySQLi support
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysqli mysqli mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysqli mysqli /usr/bin/mysql_config)"
+ fi
+
+ # ODBC support
+ if use odbc ; then
+ my_conf+="
+ $(use_with odbc unixODBC /usr)"
+ fi
+
+ if use iodbc ; then
+ my_conf+="
+ $(use_with iodbc iodbc /usr)"
+ fi
+
+ # Oracle support
+ if use oci8-instant-client ; then
+ my_conf+="
+ $(use_with oci8-instant-client oci8)"
+ fi
+
+ # PDO support
+ if use pdo ; then
+ my_conf+="
+ $(use_with mssql pdo-dblib )"
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysql pdo-mysql mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysql pdo-mysql /usr)"
+ fi
+ my_conf+="
+ $(use_with postgres pdo-pgsql )
+ $(use_with sqlite pdo-sqlite /usr)
+ $(use_with odbc pdo-odbc unixODBC,/usr)"
+ if use oci8-instant-client ; then
+ my_conf+="
+ $(use_with oci8-instant-client pdo-oci)"
+ fi
+ fi
+
+ # readline/libedit support
+ my_conf+="
+ $(use_with readline readline )
+ $(use_with libedit libedit )"
+
+ # Session support
+ if use session ; then
+ my_conf+="
+ $(use_with sharedmem mm )"
+ else
+ my_conf+="
+ $(use_enable session session )"
+ fi
+
+ if use pic ; then
+ my_conf="${my_conf} --with-pic"
+ fi
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Support user-passed configuration parameters
+ my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build"
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+ cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+ sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+ --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --enable-${sapi}"
+ else
+ sapi_conf="${sapi_conf} --disable-${sapi}"
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+ else
+ sapi_conf="${sapi_conf} --without-apxs2"
+ fi
+ ;;
+ esac
+ done
+
+ econf ${sapi_conf}
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mibs/.index
+
+ SAPI_DIR="${WORKDIR}/sapis"
+
+ for sapi in ${SAPIS} ; do
+ use "${sapi}" || continue
+
+ php_sapi_build "${sapi}"
+ php_sapi_copy "${sapi}"
+ done
+}
+
+php_sapi_build() {
+ mkdir -p "${SAPI_DIR}/$1"
+
+ cd "${WORKDIR}/sapis-build/$1"
+ emake || die "emake failed"
+}
+
+php_sapi_copy() {
+ local sapi="$1"
+ local source=""
+
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}.so"
+ ;;
+
+ apache2)
+ # apache2 is a special case; the necessary files
+ # (yes, multiple) are copied by make install, not
+ # by the ebuild; that's the reason, why apache2 has
+ # to be the last sapi
+ emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
+ ;;
+
+ *)
+ die "unhandled sapi in php_sapi_copy"
+ ;;
+ esac
+
+ if [[ "${source}" ]] ; then
+ cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
+ fi
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi"
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs \
+ || die "emake install failed"
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir /usr/share/php${PHP_MV}
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}"
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+ else
+ dobin "${source}" || die "Unable to install ${sapi} sapi"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" \
+ "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+ "${ED}/etc/env.d/20php${SLOT}"
+ sed -e "s|php5|php${SLOT}|g" -i \
+ "${ED}/etc/env.d/20php${SLOT}"
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+#Do not use eblit for this because it will not get sourced when installing from
+#binary package (bug #380845)
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ APACHE2_MOD_DEFINE="PHP5"
+ APACHE2_MOD_CONF="70_mod_php5"
+ apache-module_pkg_postinst
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT}
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+ elog "to compile extensions for the ${SLOT} ABI"
+ elog
+ if ! use readline && use cli ; then
+ ewarn "Note that in order to use php interactivly, you need to enable"
+ ewarn "the readline USE flag or php -a will hang"
+ fi
+ elog
+ elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+ elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+ elog "'production' or 'development' in /etc/make.conf"
+ ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+ # check for not yet migrated old style config dirs
+ ls "${ROOT}"/etc/php/*-php5 &>/dev/null
+ if [[ $? -eq 0 ]]; then
+ ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
+ ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
+ fi
+ elog
+ elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+ elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+ elog
+
+ if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
+ ewarn "The suhosin USE flag now only installs the suhosin patch!"
+ ewarn "If you want the suhosin extension, make sure you install"
+ ewarn " dev-php5/suhosin"
+ ewarn
+ fi
+}
diff --git a/dev-lang/php/php-5.4.12.ebuild b/dev-lang/php/php-5.4.12.ebuild
new file mode 100644
index 000000000000..b34a27461211
--- /dev/null
+++ b/dev-lang/php/php-5.4.12.ebuild
@@ -0,0 +1,863 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.12.ebuild,v 1.1 2013/03/04 11:45:07 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+SUHOSIN_VERSION=""
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+ case "${1}" in
+ "php-pre")
+ echo "http://downloads.php.net/stas/${2}"
+ ;;
+ "php")
+ echo "http://www.php.net/distributions/${2}"
+ ;;
+ "suhosin")
+ echo "http://download.suhosin.org/${2}"
+ ;;
+ "olemarkus")
+ echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+ ;;
+ "gentoo")
+ echo "mirror://gentoo/${2}"
+ ;;
+ *)
+ die "unhandled case in php_get_uri"
+ ;;
+ esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+ $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
+ # in some cases we use our own suhosin patch (very recent version,
+ # patch conflicts, etc.)
+ SUHOSIN_TYPE="olemarkus"
+else
+ SUHOSIN_TYPE="suhosin"
+fi
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+ SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+ SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+ ${PHP_SRC_URI}
+ ${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+ SRC_URI="${SRC_URI}
+ suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# Gentoo-specific, common features
+IUSE="kolab"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} 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 selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite ssl
+ sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+ +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
+
+DEPEND="
+ >=app-admin/eselect-php-0.6.2
+ >=dev-libs/libpcre-8.12[unicode]
+ apache2? ( www-servers/apache[threads=] )
+ berkdb? ( =sys-libs/db-4* )
+ bzip2? ( app-arch/bzip2 )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ cjk? ( !gd? (
+ virtual/jpeg
+ media-libs/libpng
+ sys-libs/zlib
+ ) )
+ crypt? ( >=dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ exif? ( !gd? (
+ virtual/jpeg
+ media-libs/libpng
+ sys-libs/zlib
+ ) )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gmp? ( >=dev-libs/gmp-4.1.2 )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ kolab? ( >=net-libs/c-client-2004g-r1 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ !mysqlnd? (
+ mysql? ( virtual/mysql )
+ mysqli? ( >=virtual/mysql-4.1 )
+ )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql-base )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? ( >=dev-libs/openssl-0.9.7 )
+ sybase-ct? ( dev-db/freetds )
+ tidy? ( app-text/htmltidy )
+ truetype? (
+ =media-libs/freetype-2*
+ >=media-libs/t1lib-5.0.0
+ !gd? (
+ virtual/jpeg media-libs/libpng sys-libs/zlib )
+ )
+ unicode? ( dev-libs/oniguruma )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? (
+ x11-libs/libXpm
+ virtual/jpeg
+ media-libs/libpng sys-libs/zlib
+ )
+ xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib )
+ virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+ 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 ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+ sys-devel/flex
+ >=sys-devel/m4-1.4.3
+ >=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+ production|development)
+ ;;
+ *)
+ PHP_INI_VERSION="development"
+ ;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+ depend.apache_pkg_setup
+}
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+ cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "apache2" ]] ; then
+ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+ newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+ "70_mod_php${PHP_MV}.conf"
+ fi
+
+ if [[ "${sapi}" == "fpm" ]] ; then
+ [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
+ [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+ einfo "Installing FPM CGI config file php-fpm.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+ dodir "/etc/init.d"
+ insinto "/etc/init.d"
+ newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
+ # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
+
+ # Remove bogus /etc/php-fpm.conf.default (bug 359906)
+ [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+ fi
+
+ # Install PHP ini files into /usr/share/php
+
+ dodoc php.ini-development
+ dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+ # ([empty session.save_path]/session_mm_[sapi][gid].sem)
+ # there is no easy way to circumvent that, all php calls during
+ # install use -n, so no php.ini file will be used.
+ # As such, this is the easiest way to get around
+ addpredict /session_mm_cli250.sem
+ addpredict /session_mm_cli0.sem
+
+ # kolab support (support for imap annotations)
+ use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch"
+
+ # Change PHP branding
+ # Get the alpha/beta/rc version
+ local ver=$(get_version_component_range 4)
+ sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-${ver}-pl${PR/r/}-gentoo\2|g" \
+ -i configure.in || die "Unable to change PHP branding"
+
+ # Apply generic PHP patches
+ EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+ # Patch PHP to show Gentoo as the server platform
+ sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+ -i configure.in || die "Failed to fix server platform name"
+
+ # Prevent PHP from activating the Apache config,
+ # as we will do that ourselves
+ sed -i \
+ -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+ # Patch PHP to support heimdal instead of mit-krb5
+ if has_version "app-crypt/heimdal" ; then
+ sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+ || die "Failed to fix heimdal libname"
+ sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+ || die "Failed to fix heimdal crypt library reference"
+ fi
+
+ # Suhosin support
+ if [[ -n $SUHOSIN_VERSION ]] ; then
+ if use suhosin ; then
+ epatch "${WORKDIR}/${SUHOSIN_PATCH}"
+ fi
+ else
+ ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
+ fi
+
+ #Add user patches #357637
+ epatch_user
+
+ #force rebuilding aclocal.m4
+ rm aclocal.m4
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # http://bugs.php.net/bug.php?id=48795, bug #343481
+ sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+ fi
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # This is a global variable and should be in caps. It isn't because the
+ # phpconfutils eclass relies on exactly this name...
+ # for --with-libdir see bug #327025
+ my_conf="
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}"/man
+ --infodir="${PHP_DESTDIR}"/info
+ --libdir="${PHP_DESTDIR}"/lib
+ --with-libdir=$(get_libdir)
+ --without-pear
+ $(use_enable threads maintainer-zts)"
+
+ # extension USE flag shared
+ my_conf+="
+ $(use_enable bcmath bcmath )
+ $(use_with bzip2 bz2 "${EPREFIX}"/usr)
+ $(use_enable calendar calendar )
+ $(use_enable ctype ctype )
+ $(use_with curl curl "${EPREFIX}"/usr)
+ $(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+ $(use_enable xml dom )
+ $(use_with enchant enchant "${EPREFIX}"/usr)
+ $(use_enable exif exif )
+ $(use_enable fileinfo fileinfo )
+ $(use_enable filter filter )
+ $(use_enable ftp ftp )
+ $(use_with nls gettext "${EPREFIX}"/usr)
+ $(use_with gmp gmp "${EPREFIX}"/usr)
+ $(use_enable hash hash )
+ $(use_with mhash mhash "${EPREFIX}"/usr)
+ $(use_with iconv iconv )
+ $(use_enable intl intl )
+ $(use_enable ipv6 ipv6 )
+ $(use_enable json json )
+ $(use_with kerberos kerberos "${EPREFIX}"/usr)
+ $(use_enable xml libxml )
+ $(use_with xml libxml-dir "${EPREFIX}"/usr)
+ $(use_enable unicode mbstring )
+ $(use_with crypt mcrypt "${EPREFIX}"/usr)
+ $(use_with mssql mssql "${EPREFIX}"/usr)
+ $(use_with unicode onig "${EPREFIX}"/usr)
+ $(use_with ssl openssl "${EPREFIX}"/usr)
+ $(use_with ssl openssl-dir "${EPREFIX}"/usr)
+ $(use_enable pcntl pcntl )
+ $(use_enable phar phar )
+ $(use_enable pdo pdo )
+ $(use_with postgres pgsql "${EPREFIX}"/usr)
+ $(use_enable posix posix )
+ $(use_with spell pspell "${EPREFIX}"/usr)
+ $(use_with recode recode "${EPREFIX}"/usr)
+ $(use_enable simplexml simplexml )
+ $(use_enable sharedmem shmop )
+ $(use_with snmp snmp "${EPREFIX}"/usr)
+ $(use_enable soap soap )
+ $(use_enable sockets sockets )
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+ $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+ $(use_enable sysvipc sysvmsg )
+ $(use_enable sysvipc sysvsem )
+ $(use_enable sysvipc sysvshm )
+ $(use_with tidy tidy "${EPREFIX}"/usr)
+ $(use_enable tokenizer tokenizer )
+ $(use_enable wddx wddx )
+ $(use_enable xml xml )
+ $(use_enable xmlreader xmlreader )
+ $(use_enable xmlwriter xmlwriter )
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xsl xsl "${EPREFIX}"/usr)
+ $(use_enable zip zip )
+ $(use_with zlib zlib "${EPREFIX}"/usr)
+ $(use_enable debug debug )"
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ my_conf="${my_conf} --enable-dba${shared}"
+ fi
+
+ # DBA drivers support
+ my_conf+="
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 ${EPREFIX}/usr)
+ $(use_enable flatfile flatfile )
+ $(use_with gdbm gdbm ${EPREFIX}/usr)
+ $(use_enable inifile inifile )
+ $(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+ # Support for the GD graphics library
+ my_conf+="
+ $(use_with truetype freetype-dir ${EPREFIX}/usr)
+ $(use_with truetype t1lib ${EPREFIX}/usr)
+ $(use_enable cjk gd-jis-conv )
+ $(use_with gd jpeg-dir ${EPREFIX}/usr)
+ $(use_with gd png-dir ${EPREFIX}/usr)
+ $(use_with xpm xpm-dir ${EPREFIX}/usr)"
+ # enable gd last, so configure can pick up the previous settings
+ my_conf+="
+ $(use_with gd gd)"
+
+ # IMAP support
+ if use imap ; then
+ my_conf+="
+ $(use_with imap imap ${EPREFIX}/usr)
+ $(use_with ssl imap-ssl ${EPREFIX}/usr)"
+ fi
+
+ # Interbase/firebird support
+
+ if use firebird ; then
+ my_conf+="
+ $(use_with firebird interbase ${EPREFIX}/usr)"
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ my_conf+="
+ $(use_with ldap ldap ${EPREFIX}/usr)
+ $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+ fi
+
+ # MySQL support
+ if use mysql ; then
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysql mysql mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysql mysql ${EPREFIX}/usr)"
+ fi
+ my_conf+="
+ $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+ fi
+
+ # MySQLi support
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysqli mysqli mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+ fi
+
+ # ODBC support
+ if use odbc ; then
+ my_conf+="
+ $(use_with odbc unixODBC ${EPREFIX}/usr)"
+ fi
+
+ if use iodbc ; then
+ my_conf+="
+ $(use_with iodbc iodbc ${EPREFIX}/usr)"
+ fi
+
+ # Oracle support
+ if use oci8-instant-client ; then
+ my_conf+="
+ $(use_with oci8-instant-client oci8)"
+ fi
+
+ # PDO support
+ if use pdo ; then
+ my_conf+="
+ $(use_with mssql pdo-dblib )"
+ if use mysqlnd ; then
+ my_conf+="
+ $(use_with mysqlnd pdo-mysql mysqlnd)"
+ else
+ my_conf+="
+ $(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+ fi
+ my_conf+="
+ $(use_with postgres pdo-pgsql )
+ $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+ $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+ if use oci8-instant-client ; then
+ my_conf+="
+ $(use_with oci8-instant-client pdo-oci)"
+ fi
+ fi
+
+ # readline/libedit support
+ my_conf+="
+ $(use_with readline readline ${EPREFIX}/usr)
+ $(use_with libedit libedit ${EPREFIX}/usr)"
+
+ # Session support
+ if use session ; then
+ my_conf+="
+ $(use_with sharedmem mm ${EPREFIX}/usr)"
+ else
+ my_conf+="
+ $(use_enable session session )"
+ fi
+
+ if use pic ; then
+ my_conf="${my_conf} --with-pic"
+ fi
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Support user-passed configuration parameters
+ my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build"
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+ cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+ sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+ --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --enable-${sapi}"
+ else
+ sapi_conf="${sapi_conf} --disable-${sapi}"
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+ else
+ sapi_conf="${sapi_conf} --without-apxs2"
+ fi
+ ;;
+ esac
+ done
+
+ econf ${sapi_conf}
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake || die "emake failed"
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi"
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs \
+ || die "emake install failed"
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir /usr/share/php${PHP_MV}
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}"
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+ else
+ dobin "${source}" || die "Unable to install ${sapi} sapi"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" \
+ "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+ "${ED}/etc/env.d/20php${SLOT}"
+ sed -e "s|php5|php${SLOT}|g" -i \
+ "${ED}/etc/env.d/20php${SLOT}"
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ APACHE2_MOD_DEFINE="PHP5"
+ APACHE2_MOD_CONF="70_mod_php5"
+ apache-module_pkg_postinst
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT}
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+ elog "to compile extensions for the ${SLOT} ABI"
+ elog
+ if ! use readline && use cli ; then
+ ewarn "Note that in order to use php interactivly, you need to enable"
+ ewarn "the readline USE flag or php -a will hang"
+ fi
+ elog
+ elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+ elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+ elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+ elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+ elog
+ elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+ elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+ elog
+
+ if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
+ ewarn
+ ewarn "The suhosin USE flag now only installs the suhosin patch!"
+ ewarn "If you want the suhosin extension, make sure you install"
+ ewarn " dev-php/suhosin"
+ ewarn
+ fi
+}
+
+pkg_prerm() {
+ local sapi
+ local slot
+ for sapi in ${SAPIS}; do
+ slot=$(eselect php show $sapi 2> /dev/null)
+ slot=${slot/php/}
+ if [[ $slot == $SLOT ]]; then
+ ewarn "You have removed the active version of the $sapi SAPI"
+ ewarn "Fix the issue using \`eselect php\`"
+ fi
+ done
+}
diff --git a/dev-lang/ruby/ruby-1.8.7_p371.ebuild b/dev-lang/ruby/ruby-1.8.7_p371.ebuild
index 64ccac128a9a..f893d7d560f6 100644
--- a/dev-lang/ruby/ruby-1.8.7_p371.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p371.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p371.ebuild,v 1.2 2013/03/04 09:01:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p371.ebuild,v 1.5 2013/03/04 18:34:17 ranger Exp $
EAPI=2
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
RDEPEND="
diff --git a/dev-libs/UTF8Strings/Manifest b/dev-libs/UTF8Strings/Manifest
index 87abdc2ffb19..18ae9c53c555 100644
--- a/dev-libs/UTF8Strings/Manifest
+++ b/dev-libs/UTF8Strings/Manifest
@@ -1,3 +1,4 @@
DIST UTF8Strings-1.12.0.tar.bz2 6616 SHA256 7acf9b0123dd0178a0bb06218895fec3e8ff4679d03688efddb9625696999df8 SHA512 db1eda28481ad38c37d48a297924957efe310d15177437ab4923881e4a98bec52005fdb9d841824806604224cc94211d506636d471c535ba0d3a9330bfd6543a WHIRLPOOL c624ec2cf6342a388f1e9fc1c600fafb9997a20151c97ff26a776e1fcd7e507a3c2ac35670c169f7755f82f9c5d7c64079f61d48e2467ca2e0fdaa09e72a8724
DIST UTF8Strings-1.12.1.tar.bz2 6699 SHA256 73f464e23fd30ca8770c0b22141740a195453c6c866cb329d3ad6f1626703981 SHA512 936d357c7a8310bcee5b00d82ec7193b590385026ea37460e6f4976eb9a1b2bf9b5c8b8af029163e012baf373f33c1f3c5dd254b9ceda4369cb74495d6947c74 WHIRLPOOL 1541316b7b4bf189ded8cab446d37dcb3dccaea0473797ba01336ac9bf1babffb0cc326b760deebe6b5fe784e8d497df5fba63a627d46f41f0ce81368ebb92f6
+DIST UTF8Strings-1.13.0.tar.bz2 7073 SHA256 c8d9af929b986e7f9a3ac5a7b3e6f8306e4f0a402f37b7002f2a132e75b4d657 SHA512 7fe02d096cb9d52adff15365f8a827fa1b4f10951e5b716f4df76df25ca6d937611c261a33cb9acb3fecce9e0ffb00fa105c2d6eb0c9af00d2f7062b99bc40c2 WHIRLPOOL 5cf868caf6dacce8da21aa791e66fce998e559ad00329939d520205e9ef56fe36c9d4a171849d60106a431ecea078904535074163bea5e75879e4b37e9db030b
DIST UTF8Strings-1.9.tar.bz2 5708 SHA256 7933b8a56fc83da34a49f0da67c056eb0340d20b544aa403ed2c5a076c72a054 SHA512 9d965a05fdd21109f14ca2b72a2c03484230f2824063beb676eda6eb022df0289c7596af0dbaa8732dc05b884a4cba695471dc47769c91792fee5ea3aafc398a WHIRLPOOL 7cc2bc5457c32bd00bc9a1932d9f5d16d3cf818ccb9b1b4556d19146243fac4697c28b82cbc155cd106c1b969699488417ad1b151529bd487028b2dfb4407d4d
diff --git a/dev-libs/UTF8Strings/UTF8Strings-1.13.0.ebuild b/dev-libs/UTF8Strings/UTF8Strings-1.13.0.ebuild
new file mode 100644
index 000000000000..8358ba5a6c58
--- /dev/null
+++ b/dev-libs/UTF8Strings/UTF8Strings-1.13.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/UTF8Strings/UTF8Strings-1.13.0.ebuild,v 1.1 2013/03/04 13:36:37 tomwij Exp $
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="C++ library that provides ability to work natively with UTF8 strings in a very simple way."
+HOMEPAGE="http://grigory.info/${PN}.About.html"
+SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index d29a6c5cea3f..7390c7beb38a 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,2 +1,3 @@
DIST angelscript_2.25.2.zip 1232872 SHA256 84f2befc22f0541becf987519f6dc3d5dd561547bb5e6219327374ead0d516eb SHA512 78e7b077caac7eb426cd70fb6c23fb9433c120333e53281ec218feaf7ef615ad5dca433b5d127e80797f6540b8643f3af231664a3ebce39f4972b88309ab0823 WHIRLPOOL 70387ee26eaae4aaa04a1311cb4c1806ff400c576498a42aee751fa94ae952aaa455c7a4bc6eec55f009532b1f3ee4a825cc60df608e3e9b125d19952b8de503
DIST angelscript_2.26.0.zip 1374077 SHA256 2701441de3e8bdbb601d560b95bd6302a82ab9432fb64b1634f7667468f57f9e SHA512 025c694dc8129ef1f5336f4d91ab0fc8e1438916982f95017ac16bc8c68556b4868e6670886fdd245f7b8aeaa2a5dc23f995376c8493d33ffecd5c908fd7dbf2 WHIRLPOOL ad4cd3bb37ef104999a9aef4911cbff9602547d0c0aec5ceee9898dad1b1545f319cb1c6154d56cc00bfb4bfa04d4daed8a2e5427e05d21563d62f8ba879136f
+DIST angelscript_2.26.1.zip 1381321 SHA256 40896a61008671df8210efe9d1b9dc78fc32dafca35f5b4d2526b151ff7d97e6 SHA512 327f87c3e836327ad3fc71031bc6c2559f05dea03c149fedd93aca147042292fab58e484cea9052403379cc5c9c1d4667732a610f0688bd87520c823484bb384 WHIRLPOOL 315b5453782fc018693a0ba62147df18ee0cc876b1593b8c728671f990614d18543d13ad33fb06ba803ed590c7e44ed2385f705c86fca99573afbae831d2092c
diff --git a/dev-libs/angelscript/angelscript-2.26.1.ebuild b/dev-libs/angelscript/angelscript-2.26.1.ebuild
new file mode 100644
index 000000000000..afd59ad45ead
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.26.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.26.1.ebuild,v 1.1 2013/03/04 16:09:53 hasufell Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk/${PN}/projects/gnuc
+S2=${WORKDIR}/${P}_static
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-QA.patch
+
+ if use static-libs ; then
+ cp -a "${WORKDIR}"/sdk "${S2}"/ || die
+ fi
+}
+
+src_compile() {
+ tc-export CXX AR RANLIB
+
+ emake SHARED=1 VERSION=${PV}
+
+ if use static-libs ; then
+ cd "${S2}"/${PN}/projects/gnuc || die
+ emake
+ fi
+}
+
+src_install() {
+ doheader "${WORKDIR}"/sdk/${PN}/include/angelscript.h
+ dolib.so "${WORKDIR}"/sdk/${PN}/lib/libangelscript-${PV}.so
+ dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
+
+ if use static-libs ; then
+ dolib.a "${S2}"/${PN}/lib/libangelscript.a
+ fi
+
+ use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
diff --git a/dev-libs/angelscript/files/angelscript-2.26.1-QA.patch b/dev-libs/angelscript/files/angelscript-2.26.1-QA.patch
new file mode 100644
index 000000000000..484aebf4cc15
--- /dev/null
+++ b/dev-libs/angelscript/files/angelscript-2.26.1-QA.patch
@@ -0,0 +1,55 @@
+--- sdk/angelscript/projects/gnuc/makefile
++++ sdk/angelscript/projects/gnuc/makefile
+@@ -3,6 +3,7 @@
+
+ # For 'make install' to work, set LOCAL according to your system configuration
+ LOCAL = /usr/local
++INSTALL_LIBDIR = lib
+
+ # If you want to build a shared library, then run make with SHARED=1 and VERSION=version
+ ifdef SHARED
+@@ -44,10 +45,10 @@
+ else
+ OBJDIR = obj
+ LIBDIR = ../../lib
+- CXX ?= gcc
++ CXX ?= g++
+ # On i686 architecture you may need to add -march=i686 if you get
+ # an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
+- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
++ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
+ endif
+
+ AR ?= ar
+@@ -106,7 +107,7 @@
+
+ $(BIN): $(OBJDIR) $(LIBDIR) $(OBJ)
+ ifdef SHARED
+- $(CXX) -shared -Wl,-soname,$(LIB) -o $(BIN) $(OBJ)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB) -o $(BIN) $(OBJ)
+ ( cd $(LIBDIR); ln -s $(LIB) $(DEVLIB) )
+ else
+ $(AR) r $(BIN) $(OBJ)
+@@ -135,18 +136,18 @@
+ $(DELETER) $(OBJ) $(BIN) $(LIBDIR)/$(DEVLIB)
+
+ install: $(BIN)
+- @echo Installing to: $(LOCAL)/lib and $(LOCAL)/include...
++ @echo Installing to: $(LOCAL)/$(INSTALL_LIBDIR) and $(LOCAL)/include...
+ @echo -------------------------------------------------------------------
+ ifdef SHARED
+- $(COPIER) $(LIBDIR)/$(DEVLIB) $(LOCAL)/lib
++ $(COPIER) $(LIBDIR)/$(DEVLIB) $(LOCAL)/$(INSTALL_LIBDIR)
+ endif
+- $(COPIER) $(BIN) $(LOCAL)/lib
++ $(COPIER) $(BIN) $(LOCAL)/$(INSTALL_LIBDIR)
+ $(COPIER) $(INCDIR)/$(INC) $(LOCAL)/include
+ @echo -------------------------------------------------------------------
+ @echo Angelscript library installed. Enjoy!
+
+ uninstall:
+- $(DELETER) $(LOCAL)/include/$(INC) $(LOCAL)/lib/$(LIB) $(LOCAL)/lib/$(DEVLIB)
++ $(DELETER) $(LOCAL)/include/$(INC) $(LOCAL)/$(INSTALL_LIBDIR)/$(LIB) $(LOCAL)/$(INSTALL_LIBDIR)/$(DEVLIB)
+ @echo -------------------------------------------------------------------
+ @echo Angelscript library uninstalled.
+
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index f6a4b602482f..031560a769d3 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1 +1,2 @@
DIST libindicate-12.10.0.tar.gz 512998 SHA256 48b64056a3fdffe9f9b3740f349b5e69757bb5d8199995a2e2c714707d500c17 SHA512 261df26eb90e138537ac16489aada741a2f618933e433b00d1ef8f5cb860d6b8831e19d9cc25837f8cf3d0a3688937d75e16296ba466e32cbc8ef9533bd6c1dc WHIRLPOOL 07202e0fc9778f29e109d07e8abb5cffbbc703c7625ac9163f776c8e558a86de3f130f81501e36d7c715aea4dc3a1bfd570db16902c243a826000245e46e71ba
+DIST libindicate-12.10.1.tar.gz 550378 SHA256 41e0c059e96172975c716aa70dc60f669e21d359c65935c61ac374a9aa075581 SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06 WHIRLPOOL f175329bac76581ebc596771794e8e81c4e03b6042cc3508a7743034b7ed1f50b61b9accf78595c3beeed7236801096dfb58d42bd94959b433dfcf92b3114fae
diff --git a/dev-libs/libindicate/libindicate-12.10.1.ebuild b/dev-libs/libindicate/libindicate-12.10.1.ebuild
new file mode 100644
index 000000000000..2451b453c1ce
--- /dev/null
+++ b/dev-libs/libindicate/libindicate-12.10.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-12.10.1.ebuild,v 1.1 2013/03/04 11:43:27 kensington Exp $
+
+EAPI=5
+
+AYATANA_VALA_VERSION=0.16
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A library to raise flags on DBus for other components of the desktop to pick up and visualize"
+HOMEPAGE="http://launchpad.net/libindicate"
+SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +introspection"
+
+RESTRICT="test" # consequence of the -no-mono.patch
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+ >=dev-libs/glib-2.30
+ >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?]
+ dev-libs/libxml2
+ gtk? ( >=x11-libs/gtk+-3.2:3 )
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ !<${CATEGORY}/${PN}-0.6.1-r201"
+EAUTORECONF_DEPEND="dev-util/gtk-doc-am
+ gnome-base/gnome-common"
+DEPEND="${RDEPEND}
+ ${EAUTORECONF_DEPEND}
+ app-text/gnome-doc-utils
+ dev-lang/vala:${AYATANA_VALA_VERSION}[vapigen]
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.6.1-no-mono.patch
+ sed -i -e "s:vapigen:vapigen-${AYATANA_VALA_VERSION}:" configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -Wno-error
+
+ # python bindings are only for GTK+-2.x
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-silent-rules \
+ --disable-static \
+ $(use_enable gtk) \
+ $(use_enable introspection) \
+ --disable-python \
+ --disable-scrollkeeper \
+ --with-gtk=3 \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS
+
+ nonfatal dosym /usr/share/doc/${PF}/html/${PN} /usr/share/gtk-doc/html/${PN}
+
+ prune_libtool_files
+}
diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..a9a73b4d5fcf
--- /dev/null
+++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r2.ebuild,v 1.1 2013/03/04 09:17:05 olemarkus Exp $
+
+EAPI="3"
+
+PHP_EXT_NAME="ffmpeg"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-source-r2 eutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension that provides access to movie info."
+HOMEPAGE="http://sourceforge.net/projects/ffmpeg-php/"
+SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/ffmpeg
+ dev-lang/php[gd]"
+RDEPEND="${DEPEND}"
+
+# The test breaks with the test movie, but it the same code works fine with
+# other movies
+
+RESTRICT="test"
+
+DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"
+
+src_prepare() {
+ for slot in $(php_get_slots) ; do
+ cd "${WORKDIR}/${slot}"
+ epatch "${FILESDIR}/${P}-avutil50.patch"
+ epatch "${FILESDIR}/${P}-ffmpeg.patch"
+ epatch "${FILESDIR}/${P}-log.patch"
+ epatch "${FILESDIR}/${P}-php5-4.patch"
+ done
+ php-ext-source-r2_src_prepare
+}
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch
new file mode 100644
index 000000000000..cc33682cac1e
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch
@@ -0,0 +1,29 @@
+--- ffmpeg-php-0.6.0.orig/ffmpeg_movie.c.bak 2013-02-24 16:44:31.162791000 +0200
++++ ffmpeg-php-0.6.0/ffmpeg_movie.c 2013-02-24 16:45:20.632791000 +0200
+@@ -308,7 +308,7 @@
+ }
+
+ if (persistent) {
+- list_entry *le;
++ zend_rsrc_list_entry *le;
+ /* resolve the fully-qualified path name to use as the hash key */
+ fullpath = expand_filepath(filename, NULL TSRMLS_CC);
+
+@@ -343,7 +343,7 @@
+ }
+
+ } else { /* no existing persistant movie, create one */
+- list_entry new_le;
++ zend_rsrc_list_entry new_le;
+ ffmovie_ctx = _php_alloc_ffmovie_ctx(1);
+
+ if (_php_open_movie_file(ffmovie_ctx, filename)) {
+@@ -357,7 +357,7 @@
+ new_le.ptr = ffmovie_ctx;
+
+ if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
+- hashkey_length+1, (void *)&new_le, sizeof(list_entry),
++ hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry),
+ NULL)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Failed to register persistent resource");
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index c65845ef4d42..a38f111a3adf 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,3 +1,4 @@
DIST memcache-2.2.6.tgz 35957 SHA256 c6d1aef326d8d0d9425d7e19e61e51bb578fdd5e979eb13cae562918009748bf SHA512 db6e9b693e0d33bab2e14a5f5e2810cb2d4e6c42b33ac65b4fec78f38ead34151a2adc98ccbcc4f7d8158cc4dbcfa9171102aec290b388d53a66d29c236068e0 WHIRLPOOL caf5260e06118ccf17d16063af65e59901ac43f0e2f04bc452bf920b1f6cdebe26a1954c7d8d4b972c92fadb8757c8f1a17497b8ed7e1e99cda4c72a1aa55d5b
DIST memcache-3.0.5.tgz 54242 SHA256 ed248ae72b273097d8e6271b9cd0e6168ddd3cc30f72689bc5e0829a96f3fe24 SHA512 c3ab3955bd2d6bc4e28ab475344d2f8dc5a86919d809795575ac2639f378a581f7504f35cf86a160fcf60b71789abf7ac26581d3cb1aa68e11d4799fdcc2708c WHIRLPOOL 8d292b11ace0f403cc00f5e8f8c46c017280c5dfba5ef82a56aa285c086bd353f1324997224b0350e9b85e93089e33ad7e5b78b43dbad4f1945d168186b93af3
DIST memcache-3.0.6.tgz 54717 SHA256 cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618 SHA512 94dc24bd563116174f185eb88298a025db9e1defde0b1f81c9a046338ed2d1ac91968bdd85223f46a4bfb43442f1499c316eeb4b93f80077fd3079bbd3528645 WHIRLPOOL b1b2230bfdf90727f397c8f11a14775b6e51e0d22a69da4a82fe603904c1407574ea1123a86b62a1efbb6a08bac81fe4c0af8786ef4a1c233562daea5daa488e
+DIST memcache-3.0.7.tgz 55300 SHA256 f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f SHA512 c40a9d831b347c877d7a56bf21a7f96a715a7e251212963daf7aa01564a27bbc8fbcab55fc4a20976763b32d6498501b031776fc531d094389ea98853282cefe WHIRLPOOL 2cef663feaab1ce179fe5f287718ffadf45b984ee128f5c934d816db1311e295376ff6b1be48e963df18a24df7110fb5e13f7028ce8212b5382f34a3efb40cd0
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.7.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.7.ebuild
new file mode 100644
index 000000000000..da3b4044a0a3
--- /dev/null
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.7.ebuild,v 1.1 2013/03/04 09:22:21 olemarkus Exp $
+
+EAPI="5"
+PHP_EXT_NAME="memcache"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for using memcached."
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session"
+
+DEPEND="sys-libs/zlib
+ dev-lang/php[session?]"
+RDEPEND="${DEPEND}"
+
+# upstream does not ship any testsuite, so the PHPize test-runner fails.
+RESTRICT='test'
+
+src_configure() {
+ my_conf="--enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session)"
+ php-ext-source-r2_src_configure
+}
+
+src_install() {
+ php-ext-pecl-r2_src_install
+
+ php-ext-source-r2_addtoinifiles "memcache.allow_failover" "true"
+ php-ext-source-r2_addtoinifiles "memcache.max_failover_attempts" "20"
+ php-ext-source-r2_addtoinifiles "memcache.chunk_size" "32768"
+ php-ext-source-r2_addtoinifiles "memcache.default_port" "11211"
+ php-ext-source-r2_addtoinifiles "memcache.hash_strategy" "consistent"
+ php-ext-source-r2_addtoinifiles "memcache.hash_function" "crc32"
+ php-ext-source-r2_addtoinifiles "memcache.redundancy" "1"
+ php-ext-source-r2_addtoinifiles "memcache.session_redundancy" "2"
+ php-ext-source-r2_addtoinifiles "memcache.protocol" "ascii"
+}
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index c9bb87600169..db8f5330d51a 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,2 +1,3 @@
DIST ssh2-0.11.2.tgz 22740 SHA256 9eafa577ba77ebed29cbc2cf758f7252a881abbf5b21b79f9c8ab4e3f8e2f238 SHA512 80bea7b642f1798c5fadfad330c8c1c3ada6f4ccb4235107201bc4ba762532bd7c92cd4cac16c432bb39ecc2fda0f34c6efe393c906bbc0b42cb889320c29bf7 WHIRLPOOL 59745b3cf1d2164eb1dc6bd67adc45c5590175ae9f278ceb9533d9fc9738c8fdca2668a187964ff19b4299ae9f6dd3e15079e98934967cc356040aa5941bbd13
DIST ssh2-0.11.3.tgz 23062 SHA256 b2518e101a53fd7940e49bb36a9b9559cbbfda946ebe5bb62e220d4ce132bf33 SHA512 db29179afa1d3e9a5edc13e9ddc2d7ccfc6717edb42f4096219afb18672ad90c79595fb48a63237bad9de86d15a2d2a0d63c15a72e6e25663eea28a368ef3009 WHIRLPOOL 9b036d974f61bd8a0bc3d88eafdc0b7ce9ce61ee0789debaed59f8c880ea6b713d403b206dd3b04f211a24d2cc21280e454b90079241bdc89787a76e4cfe9691
+DIST ssh2-0.12.tgz 26223 SHA256 600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd WHIRLPOOL ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.12.ebuild
new file mode 100644
index 000000000000..20169cfa5989
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-ssh2/pecl-ssh2-0.12.ebuild,v 1.1 2013/03/04 09:32:57 olemarkus Exp $
+
+EAPI=5
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README ChangeLog"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="Provides bindings to the functions of libssh2 which implements the SSH2 protocol."
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-zendoptimizerplus/Manifest b/dev-php/pecl-zendoptimizerplus/Manifest
new file mode 100644
index 000000000000..0afe3b10511f
--- /dev/null
+++ b/dev-php/pecl-zendoptimizerplus/Manifest
@@ -0,0 +1 @@
+DIST zendoptimizerplus-7.0.0.tgz 82376 SHA256 c32aa8c75434f8f64d116694612adf6d2b40864feabbd8466b9561869ba97cfa SHA512 25e7381b94aa5d740e66c79f83bcf39a42912c2eacc622833555646a18e83987a0eea0817396c3c6eda360bec72ac1914ff207172106923dc73b36da299d6deb WHIRLPOOL a20628839e5df28ce40d2d83e26f9b6ecd2fde5ad9dbb9efc8f56ab4e100c83aa4b021f46ffe290516b7738eb2a4c7e61d15440899cd0a45d2e856116bc6b2be
diff --git a/dev-php/pecl-zendoptimizerplus/metadata.xml b/dev-php/pecl-zendoptimizerplus/metadata.xml
new file mode 100644
index 000000000000..cfc29501aae5
--- /dev/null
+++ b/dev-php/pecl-zendoptimizerplus/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ olemarkus@gentoo.org
+ Ole Markus With
+
+
+
+
+
diff --git a/dev-php/pecl-zendoptimizerplus/pecl-zendoptimizerplus-7.0.0.ebuild b/dev-php/pecl-zendoptimizerplus/pecl-zendoptimizerplus-7.0.0.ebuild
new file mode 100644
index 000000000000..6460df87b00c
--- /dev/null
+++ b/dev-php/pecl-zendoptimizerplus/pecl-zendoptimizerplus-7.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-zendoptimizerplus/pecl-zendoptimizerplus-7.0.0.ebuild,v 1.1 2013/03/04 14:39:30 olemarkus Exp $
+
+EAPI="5"
+PHP_EXT_NAME="ZendOptimizerPlus"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="The Zend Optimizer+ provides faster PHP execution through opcode caching and optimization."
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
diff --git a/dev-python/starcluster/starcluster-0.93.3.ebuild b/dev-python/starcluster/starcluster-0.93.3.ebuild
index 88bfda39ffad..88e0f024995b 100644
--- a/dev-python/starcluster/starcluster-0.93.3.ebuild
+++ b/dev-python/starcluster/starcluster-0.93.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3.ebuild,v 1.4 2012/11/13 07:27:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3.ebuild,v 1.6 2013/03/04 16:22:19 idella4 Exp $
EAPI=4
@@ -24,7 +24,7 @@ IUSE="doc bash-completion epydoc"
RDEPEND=">=dev-python/ssh-1.7.13
>=dev-python/boto-2.3.0
- =dev-python/jinja-2.6
+ >=dev-python/jinja-2.6-r1
>=dev-python/decorator-3.1.1
>=dev-python/pyasn1-0.0.13_beta
=dev-python/workerpool-0.9.2"
diff --git a/dev-ruby/crack/crack-0.3.2.ebuild b/dev-ruby/crack/crack-0.3.2.ebuild
index 90b099dd82d5..62f010546d8a 100644
--- a/dev-ruby/crack/crack-0.3.2.ebuild
+++ b/dev-ruby/crack/crack-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/crack/crack-0.3.2.ebuild,v 1.2 2013/03/04 09:00:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/crack/crack-0.3.2.ebuild,v 1.3 2013/03/04 09:19:52 ago Exp $
EAPI="2"
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/jnunemaker/crack"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/matchy )"
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
index 63cb6d6f96cc..448cd57c9697 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild,v 1.2 2013/01/27 13:44:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild,v 1.4 2013/03/04 09:21:19 ago Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="http://ruby-openid.rubyforge.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
index 8438e7cf3456..e168f65ef5c5 100644
--- a/dev-vcs/git/git-1.8.1.5.ebuild
+++ b/dev-vcs/git/git-1.8.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.1 2013/03/01 23:42:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.4 2013/03/04 18:19:26 ranger Exp $
EAPI=4
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 81b82d7a86f6..94b0594cece3 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -1 +1,2 @@
DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61
+DIST renpy-6.15.0-source.tar.bz2 10409275 SHA256 aa278691f1ebd54477f154c408b59271fdbc445b6a51b6f4a1e985cd8664a479 SHA512 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 WHIRLPOOL 8a4cda0a5c389f5dad20d8f6bab373ad9a751df80e65a154d073be9b6d2b100ce35454fb16fc2d2a488c1e76544cb7df0f27fb8a18045e8922d5e0bb1fd12a67
diff --git a/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch
new file mode 100644
index 000000000000..1aa34b29ff1a
--- /dev/null
+++ b/games-engines/renpy/files/renpy-6.15.0-multiple-abi.patch
@@ -0,0 +1,219 @@
+From: Julian Ospald
+Date: Mon Feb 25 21:35:31 UTC 2013
+Subject: fix multiple abi support
+
+--- /dev/null
++++ renpy-6.15.0-source/renpy/common.py
+@@ -0,0 +1,79 @@
++# (the "Software"), to deal in the Software without restriction,
++# including without limitation the rights to use, copy, modify, merge,
++# publish, distribute, sublicense, and/or sell copies of the Software,
++# and to permit persons to whom the Software is furnished to do so,
++# subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++import os
++import sys
++import warnings
++from distutils.sysconfig import get_python_lib
++
++# Functions to be customized by distributors. ################################
++
++# Given the Ren'Py base directory (usually the directory containing
++# this file), this is expected to return the path to the common directory.
++def path_to_common(renpy_base):
++ return renpy_base + "/renpy/common"
++
++# Given a directory holding a Ren'Py game, this is expected to return
++# the path to a directory that will hold save files.
++def path_to_saves(gamedir):
++ import renpy #@UnresolvedImport
++
++ if not renpy.config.save_directory:
++ return gamedir + "/saves"
++
++ # Search the path above Ren'Py for a directory named "Ren'Py Data".
++ # If it exists, then use that for our save directory.
++ path = renpy.config.renpy_base
++
++ while True:
++ if os.path.isdir(path + "/Ren'Py Data"):
++ return path + "/Ren'Py Data/" + renpy.config.save_directory
++
++ newpath = os.path.dirname(path)
++ if path == newpath:
++ break
++ path = newpath
++
++ # Otherwise, put the saves in a platform-specific location.
++ if renpy.android:
++ return gamedir + "/saves"
++
++ elif renpy.macintosh:
++ rv = "~/Library/RenPy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++ elif renpy.windows:
++ if 'APPDATA' in os.environ:
++ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
++ else:
++ rv = "~/RenPy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++ else:
++ rv = "~/.renpy/" + renpy.config.save_directory
++ return os.path.expanduser(rv)
++
++
++# Returns the path to the Ren'Py base directory (containing common and
++# the launcher, usually.)
++def path_to_renpy_base():
++ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
++ renpy_base = get_python_lib() + "/renpy@SLOT@"
++ renpy_base = os.environ.get('RENPY_BASE', renpy_base)
++ renpy_base = os.path.abspath(renpy_base)
++
++ return renpy_base
+--- renpy-6.15.0-source/renpy.py
++++ renpy-6.15.0-source/renpy.py
+@@ -25,64 +25,9 @@
+ import sys
+ import warnings
+
+-# Functions to be customized by distributors. ################################
+-
+-# Given the Ren'Py base directory (usually the directory containing
+-# this file), this is expected to return the path to the common directory.
+-def path_to_common(renpy_base):
+- return renpy_base + "/renpy/common"
+-
+-# Given a directory holding a Ren'Py game, this is expected to return
+-# the path to a directory that will hold save files.
+-def path_to_saves(gamedir):
+- import renpy #@UnresolvedImport
+-
+- if not renpy.config.save_directory:
+- return gamedir + "/saves"
+-
+- # Search the path above Ren'Py for a directory named "Ren'Py Data".
+- # If it exists, then use that for our save directory.
+- path = renpy.config.renpy_base
+-
+- while True:
+- if os.path.isdir(path + "/Ren'Py Data"):
+- return path + "/Ren'Py Data/" + renpy.config.save_directory
+-
+- newpath = os.path.dirname(path)
+- if path == newpath:
+- break
+- path = newpath
+-
+- # Otherwise, put the saves in a platform-specific location.
+- if renpy.android:
+- return gamedir + "/saves"
+-
+- elif renpy.macintosh:
+- rv = "~/Library/RenPy/" + renpy.config.save_directory
+- return os.path.expanduser(rv)
+-
+- elif renpy.windows:
+- if 'APPDATA' in os.environ:
+- return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
+- else:
+- rv = "~/RenPy/" + renpy.config.save_directory
+- return os.path.expanduser(rv)
+-
+- else:
+- rv = "~/.renpy/" + renpy.config.save_directory
+- return os.path.expanduser(rv)
+-
+-
+-# Returns the path to the Ren'Py base directory (containing common and
+-# the launcher, usually.)
+-def path_to_renpy_base():
+- renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
+- renpy_base = os.environ.get('RENPY_BASE', renpy_base)
+- renpy_base = os.path.abspath(renpy_base)
+-
+- return renpy_base
+-
+-##############################################################################
++from distutils.sysconfig import get_python_lib
++sys.path.append(get_python_lib() + "/renpy@SLOT@")
++import renpy.common as common
+
+ # The version of the Mac Launcher and py4renpy that we require.
+ macos_version = (6, 14, 0)
+@@ -97,21 +42,10 @@
+ print "Ren'Py requires at least python 2.6."
+ sys.exit(0)
+
+-android = ("ANDROID_PRIVATE" in os.environ)
+
+-# Android requires us to add code to the main module, and to command some
+-# renderers.
+-if android:
+- __main__ = sys.modules["__main__"]
+- __main__.path_to_renpy_base = path_to_renpy_base
+- __main__.path_to_common = path_to_common
+- __main__.path_to_saves = path_to_saves
+- os.environ["RENPY_RENDERER"] = "gl"
+- os.environ["RENPY_GL_ENVIRON"] = "limited"
+-
+ def main():
+
+- renpy_base = path_to_renpy_base()
++ renpy_base = common.path_to_renpy_base()
+
+ # Add paths.
+ if os.path.exists(renpy_base + "/module"):
+@@ -134,10 +68,6 @@
+ print >>sys.stderr, "correctly, preserving the directory structure."
+ raise
+
+- if android:
+- renpy.linux = False
+- renpy.android = True
+-
+ renpy.bootstrap.bootstrap(renpy_base)
+
+ if __name__ == "__main__":
+--- renpy-6.15.0-source/renpy/main.py
++++ renpy-6.15.0-source/renpy/main.py
+@@ -27,7 +27,7 @@
+ import zipfile
+ import subprocess
+ from cPickle import loads, dumps
+-import __main__
++import renpy.common as common
+
+
+ def save_persistent():
+@@ -147,7 +147,7 @@
+ renpy.config.searchpath = [ renpy.config.gamedir ]
+
+ # Find the common directory.
+- commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
++ commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
+
+ if os.path.isdir(commondir):
+ renpy.config.searchpath.append(commondir)
+@@ -206,7 +206,7 @@
+
+ # Find the save directory.
+ if renpy.config.savedir is None:
+- renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
++ renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
+
+ if renpy.game.args.savedir: #@UndefinedVariable
+ renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
diff --git a/games-engines/renpy/renpy-6.15.0.ebuild b/games-engines/renpy/renpy-6.15.0.ebuild
new file mode 100644
index 000000000000..3357c6b3f452
--- /dev/null
+++ b/games-engines/renpy/renpy-6.15.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.0.ebuild,v 1.1 2013/03/04 16:02:13 hasufell Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils python-r1 versionator gnome2-utils games distutils-r1
+
+DESCRIPTION="Visual novel engine written in python"
+HOMEPAGE="http://www.renpy.org"
+SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+MYSLOT=$(delete_all_version_separators ${SLOT})
+KEYWORDS="~amd64 ~x86"
+IUSE="development doc examples"
+REQUIRED_USE="examples? ( development )"
+
+RDEPEND="
+ >=app-admin/eselect-renpy-0.2
+ dev-libs/fribidi
+ dev-python/pygame[X,${PYTHON_USEDEP}]
+ >=dev-python/python-exec-0.3[${PYTHON_USEDEP}]
+ media-libs/glew
+ media-libs/libpng:0
+ media-libs/libsdl[X,video]
+ media-libs/freetype:2
+ sys-libs/zlib
+ virtual/ffmpeg
+ virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+ games_pkg_setup
+ export CFLAGS="${CFLAGS} $(pkg-config --cflags fribidi)"
+}
+
+python_prepare_all() {
+ # wooosh! this should fix multiple abi
+ epatch "${FILESDIR}"/${P}-multiple-abi.patch
+
+ einfo "Deleting precompiled python files"
+ find . -name '*.py[co]' -print -delete || die
+
+ sed -i \
+ -e "s/@SLOT@/${MYSLOT}/" \
+ renpy.py renpy/common.py || die "setting slot failed!"
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ cd "${S}"/module || die
+ distutils-r1_python_compile
+}
+
+python_install() {
+ cd "${S}"/module || die
+ distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
+
+ cd "${S}" || die
+ python_scriptinto "${GAMES_BINDIR}"
+ python_newscript renpy.py ${PN}-${SLOT}
+
+ python_moduleinto renpy${MYSLOT}
+ python_domodule renpy
+ if use development ; then
+ python_domodule launcher template
+ fi
+ if use examples ; then
+ python_domodule the_question tutorial
+ fi
+}
+
+python_install_all() {
+ if use development; then
+ newicon -s 32 launcher/game/logo32.png ${P}.png
+ make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
+ fi
+
+ if use doc; then
+ dohtml -r doc
+ fi
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ use development && gnome2_icon_savelist
+
+ einfo "running: eselect renpy update --if-unset"
+ eselect renpy update --if-unset
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ use development && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use development && gnome2_icon_cache_update
+}
diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index ed6ed3693d77..23cbc6526464 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1 +1,2 @@
DIST dunelegacy-0.96.2-src.tar.bz2 1437524 SHA256 bdf27bdaa001f37db52ab4747bd563b48334db5df6e6e8314de85a0340649173 SHA512 49af1d74ea02c051b1c03393d1dc796eb1a81b402fa8a74643c308986a88ef25fe13dafded595f4144c8a83bf8fd51ad13c85c5c926fa13c436ecb08d6d9d7c1 WHIRLPOOL 47ca519e9de003c373a88fea22b198921f2ffebfaa4b068963fe68c3e06bf2370dfbf553e13f910a8c1cd084d16b5abc6369b93397220e377dcf840f544c835d
+DIST dunelegacy-0.96.3-src.tar.bz2 1652302 SHA256 677159c174d9f9e8eb20e5e5cec997decf8e5a7091dc1583dc23fe340c5f6222 SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241 WHIRLPOOL a90330135e74ee2875c18f8696aee9598cee07e185d6f7759f180d9934e5e063e0a5b449644e2744d8e480e9be35bb93277d71d0a021f3dccb0541540ef84439
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
new file mode 100644
index 000000000000..5c6a30a24bd8
--- /dev/null
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild,v 1.1 2013/03/04 16:32:18 hasufell Exp $
+
+EAPI=5
+inherit autotools eutils gnome2-utils games
+
+DESCRIPTION="Updated clone of Westood Studios' Dune2"
+HOMEPAGE="http://dunelegacy.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+alsa pulseaudio"
+
+RDEPEND="media-libs/libsdl[X,alsa?,audio,pulseaudio?,video]
+ media-libs/sdl-mixer[midi,mp3,vorbis]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+# exits on start without libsdl[alsa] or libsdl[pulseaudio]
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ doicon -s scalable ${PN}.svg
+ doicon -s 48 ${PN}.png
+ make_desktop_entry ${PN} "Dune Legacy"
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
new file mode 100644
index 000000000000..93dd907738bc
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
@@ -0,0 +1,60 @@
+Author: hasufell
+Date: Thu Aug 9 18:57:40 2012 +0200
+
+ respect flags
+ use pkg-config
+ use LDADD instead of LDFLAGS for libs
+
+--- configure.ac
++++ configure.ac
+@@ -16,14 +16,6 @@
+
+ AC_SUBST(dunelegacydatadir)
+
+-dnl Some flags for gcc
+-CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
+-dnl Additional flags: -Wconversion -Wno-sign-conversion
+-
+-dnl Some flags for clang
+-dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
+-
+-
+ dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
+ oldCFLAGS="$CFLAGS"
+ CFLAGS="-ffp-contract=off"
+@@ -33,34 +25,14 @@
+ )
+ CFLAGS="$oldCFLAGS"
+
+-case "$target_cpu" in
+-i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
+-esac
+-
+-AC_ARG_ENABLE([debug],
+- [AS_HELP_STRING([--enable-debug],
+- [compile with debug information @<:@default=disabled@:>@])],
+- [],
+- [])
+-
+-if test "$enable_debug" = "yes" ; then
+- CXXFLAGS="$CXXFLAGS -g"
+-fi
+
+ dnl Check for SDL library
+ SDL_VERSION=1.2.0
+-AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
++PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+
+-dnl Check for SDL_mixer library.
+-AC_CHECK_LIB(SDL_mixer,
+- Mix_OpenAudio,
+- LIBS="$LIBS -lSDL_mixer",
+- AC_MSG_ERROR([*** SDL_mixer library not found!])
+-)
+-
+ dnl enet defines
+ AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
+ AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
diff --git a/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r1.ebuild b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..9130e461fac0
--- /dev/null
+++ b/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r1.ebuild,v 1.4 2013/03/04 18:13:38 kensington Exp $
+
+EAPI=5
+MY_PN="OpenOfficeorgThumbnail"
+MY_P="${MY_PN}-${PV}"
+
+inherit kde4-base
+
+DESCRIPTION="KDE thumbnail-plugin that generates thumbnails for ODF files"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=110864"
+SRC_URI="http://arielch.fedorapeople.org/devel/src/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}
diff --git a/licenses/ECL-2.0 b/licenses/ECL-2.0
new file mode 100644
index 000000000000..012da6c80410
--- /dev/null
+++ b/licenses/ECL-2.0
@@ -0,0 +1,97 @@
+Educational Community License, Version 2.0 (ECL-2.0)
+(plain text)
+Educational Community License
+
+Version 2.0, April 2007
+
+http://www.osedu.org/licenses/
+
+The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. The original Apache 2.0 license can be found at: http://www.apache.org/licenses/LICENSE-2.0
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. Any patent license granted hereby with respect to contributions by an individual employed by an institution or organization is limited to patent claims where the individual that is the author of the Work is also the inventor of the patent claims licensed, and where the organization or institution has the right to grant such license under applicable grant and research funding agreements. No other express or implied licenses are granted.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Educational Community License to your work
+
+To apply the Educational Community License to your work, attach
+the following boilerplate notice, with the fields enclosed by
+brackets "[]" replaced with your own identifying information.
+(Don't include the brackets!) The text should be enclosed in the
+appropriate comment syntax for the file format. We also recommend
+that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner] Licensed under the
+ Educational Community 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.osedu.org/licenses/ECL-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.
\ No newline at end of file
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild
index 0776e77aab78..6e7e51427a0f 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild,v 1.1 2013/01/26 17:46:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r3.ebuild,v 1.2 2013/03/04 11:23:14 nimiux Exp $
EAPI="2"
@@ -9,7 +9,7 @@ HOMEPAGE="http://lxde.sf.net/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86"
IUSE=""
RDEPEND=">=lxde-base/menu-cache-0.3.3
diff --git a/lxde-base/lxpanel/lxpanel-0.5.12.ebuild b/lxde-base/lxpanel/lxpanel-0.5.12.ebuild
index fa32d14fded1..67d8ed7d897d 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.12.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.12.ebuild,v 1.2 2013/02/22 20:57:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.12.ebuild,v 1.3 2013/03/04 11:25:13 nimiux Exp $
EAPI="4"
@@ -11,7 +11,7 @@ HOMEPAGE="http://lxde.org/"
SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PV}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
SLOT="0"
IUSE="+alsa wifi"
RESTRICT="test" # bug 249598
diff --git a/media-gfx/arss/Manifest b/media-gfx/arss/Manifest
index f5e9d1d9edd1..6aebc82a8ffc 100644
--- a/media-gfx/arss/Manifest
+++ b/media-gfx/arss/Manifest
@@ -1 +1 @@
-DIST arss-0.2.3-src.tar.gz 17597 RMD160 56dfdf73d5b49f761485e91b4992bbac33c0886f SHA1 c78715dd9eeb9a5df594b09195256ac02a813313 SHA256 e2faca8b8a3902226353c4053cd9ab71595eec6ead657b5b44c14b4bef52b2b2
+DIST arss-0.2.3-src.tar.gz 17597 SHA256 e2faca8b8a3902226353c4053cd9ab71595eec6ead657b5b44c14b4bef52b2b2 SHA512 7ef7115b310c9f4ecb7bdc8f34fb1afadabadb56d50ddef27a7688fd28af511ebaa1468f2c11a91077b8197027f9e31333c22d6b5f39d2a35d7b7dfc5b90658d WHIRLPOOL 40c9ee69cde4eb55b85f5ace0f9b277ef45b517a61b7da7744b547099d1f87a954d10e9024d9df94aa33f54cd6a8e4a5d526680e593955c1f4fb88ff52aa9603
diff --git a/media-gfx/arss/arss-0.2.3.ebuild b/media-gfx/arss/arss-0.2.3.ebuild
index d5a218d221a4..18821f26f516 100644
--- a/media-gfx/arss/arss-0.2.3.ebuild
+++ b/media-gfx/arss/arss-0.2.3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/arss/arss-0.2.3.ebuild,v 1.1 2010/07/11 11:42:16 hwoarang Exp $
-
-inherit cmake-utils
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/arss/arss-0.2.3.ebuild,v 1.2 2013/03/04 18:49:20 kensington Exp $
+EAPI=5
+CMAKE_IN_SOURCE_BUILD="true"
MY_P=${P}-src
+inherit cmake-utils
+
DESCRIPTION="Analysis & Resynthesis Sound Spectrograph"
HOMEPAGE="http://arss.sourceforge.net"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -20,6 +22,4 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}/src
-CMAKE_IN_SOURCE_BUILD="TRUE"
-
-DOCS="../AUTHORS ../ChangeLog"
+DOCS=( ../AUTHORS ../ChangeLog )
diff --git a/media-libs/libmetalink/libmetalink-0.1.0.ebuild b/media-libs/libmetalink/libmetalink-0.1.0.ebuild
index baf1e9a75938..d1759e6ee889 100644
--- a/media-libs/libmetalink/libmetalink-0.1.0.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.0.ebuild,v 1.1 2012/08/01 14:35:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.0.ebuild,v 1.2 2013/03/04 18:24:11 ranger Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~x86"
IUSE="expat test"
RDEPEND="expat? ( dev-libs/expat )
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index c38695105e7f..36788a43b31c 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,2 +1,3 @@
DIST phonon-backend-vlc-0.6.0.tar.xz 54796 SHA256 1db140b67081e6f1bacdf88de88abca21edd1607c3d69dec35110c427aed133d SHA512 1093a6dd963f37a04c85643001f35026de36280e7ddab61efbc6f94e9ded3efc1f3345ed77864a8308de60d26763a6488d17237519ebca4ec74acfb7a73ae1dc WHIRLPOOL 3e4b04f2b0f3c2a53ad206acdd0cc34547f261911ed11206fc3239549190e19c2b74dbf617321132fcf9355048414f748b0a25e0a6a43df57b1416c1468ea4a2
DIST phonon-backend-vlc-0.6.1.tar.xz 54892 SHA256 41a37b672fc8df1b51be771bbd6911b653691c12a7d15cd66e195c82edf86d73 SHA512 a2b52cbca5cdfac6b1cdf96b25492f897752222a198a7c730db3ddc18bd8832d6b623738ced65626d3311dcdef0765365b5a5bc3fc8531f3f071a27a6fe01f58 WHIRLPOOL 8829aebb24480aa32554171b00e16c02eeab01b966496e111f9e844b034d23f82c50a56052bb554feb150be27000cbc3bff3a218067fa3c98fa8b449c0ca7329
+DIST phonon-backend-vlc-0.6.2.tar.xz 55500 SHA256 d4e01988f217195b910e490e499f35ef4e4a2cfefa46e22b74ba3efac77199fc SHA512 1ae699b5b912ef2f76803c389858ab8b22ff7896912c5b859b0e77bc87eba9a4b79dcd5e20291ae161a0834683dedd3b39bd47db9788ef790a9ba5b4a3fe52f2 WHIRLPOOL 73327cd0bc998682c011820a719d147e31f244a39d1a136cd7d1141877d59358bc263942021ddae4d2896670041e0e302231ed0f4c1bedbf474399c27ec5a253
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.6.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.6.2.ebuild
new file mode 100644
index 000000000000..53cf9d7240d2
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.6.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.6.2.ebuild,v 1.1 2013/03/04 17:05:02 kensington Exp $
+
+EAPI=5
+
+MY_PN="phonon-backend-vlc"
+MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+[[ ${PV} == 9999 ]] && git_eclass=git-2
+inherit cmake-utils ${git_eclass}
+unset git_eclass
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ >=media-libs/phonon-4.6.0
+ >=media-video/vlc-2.0.1[dbus,ogg,vorbis]
+ >=dev-qt/qtcore-4.6.0:4
+ >=dev-qt/qtdbus-4.6.0:4
+ >=dev-qt/qtgui-4.6.0:4
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/automoc-0.9.87
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS )
+
+pkg_postinst() {
+ elog "For more verbose debug information, export the following variables:"
+ elog "PHONON_DEBUG=1"
+ elog ""
+ elog "To make KDE detect the new backend without reboot, run:"
+ elog "kbuildsycoca4 --noincremental"
+}
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
index d18868932933..705bb00c9273 100644
--- a/media-sound/scmpc/Manifest
+++ b/media-sound/scmpc/Manifest
@@ -1,2 +1,2 @@
-DIST scmpc-0.3.1.tar.bz2 89287 SHA256 a7c171686ffe5dd15fd38f8fdcaf3d162076e02900557ec1eb96b59f16b1f557 SHA512 2ce6c6daaa1e982aebba96b39eedbaba6617ebb94fd2959d8c2f747107cee5389ded13591563caa32c07e1c2bf45a37db210cee259f4d5ab2cd25efc7971bd6b WHIRLPOOL af7f4f027233d640011b19a2cd6c9c8930f4e91c591d87606773692785820debce5e6bc02f5721bbcc860063dc084f901a7225fe81c7dd9592f19f0b8a8a5b55
DIST scmpc-0.4.0.tar.bz2 89007 SHA256 13b9d774911fc8eb6f467e7fc6f719cc0bb1052116229daa259d9dd8740cdc81 SHA512 21541912f14fb2ab5dc30be3496e719402e245a9358dbec0b37042b957258e26c3af09a230d368dac67f1531105e44cc8c43091e326017b0e1bbe2245fbf40dd WHIRLPOOL c2f1aa858f8482bd1cf95c4e299fb883b9d985cb5efaac67fe75b117ba3b80b63a0f6d12853c4bc06686ba71cb951347c87b767c4ea0a33287e7756bf98dcc6d
+DIST scmpc-0.4.1.tar.bz2 88288 SHA256 f89958dc0449f1dfbcbe81b453986812196dc86200153ac700cf606297c3fde3 SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876 WHIRLPOOL 15036bae6c20670c5bc605f3c4b3a52a97f4527bdde6ac94788ec651c2f785bdc6c705644ae4937a7bf66a4ad498f858a14fbdbe4f821c007349e7026207fc62
diff --git a/media-sound/scmpc/scmpc-0.3.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild
similarity index 59%
rename from media-sound/scmpc/scmpc-0.3.1.ebuild
rename to media-sound/scmpc/scmpc-0.4.1.ebuild
index 1e2924c93889..6e6ab942819c 100644
--- a/media-sound/scmpc/scmpc-0.3.1.ebuild
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/scmpc/scmpc-0.3.1.ebuild,v 1.5 2012/05/05 08:49:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/scmpc/scmpc-0.4.1.ebuild,v 1.1 2013/03/04 13:38:25 angelos Exp $
EAPI=4
DESCRIPTION="a client for MPD which submits your tracks to last.fm"
HOMEPAGE="http://cmende.github.com/scmpc/"
-SRC_URI="mirror://github/cmende/${PN}/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~angelos/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/glib:2
dev-libs/confuse
+ media-libs/libmpdclient
net-misc/curl"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README scmpc.conf.example )
+DOCS=( AUTHORS ChangeLog NEWS README.md scmpc.conf.example )
src_install() {
default
diff --git a/media-sound/sox/sox-14.4.1.ebuild b/media-sound/sox/sox-14.4.1.ebuild
index 892c691b7b97..ab8b66fa3fd4 100644
--- a/media-sound/sox/sox-14.4.1.ebuild
+++ b/media-sound/sox/sox-14.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v 1.6 2013/03/03 16:13:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v 1.7 2013/03/04 12:28:10 jer Exp $
EAPI=4
inherit eutils flag-o-matic autotools
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs twolame wavpack"
# libtool required for libltdl
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild
index f226c2a791b3..d71521f3469a 100644
--- a/media-video/avidemux/avidemux-2.6.1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.1.ebuild
@@ -1,89 +1,71 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.2 2013/03/02 22:06:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.3 2013/03/04 16:34:51 tomwij Exp $
+
+EAPI="5"
-EAPI=4
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
-MY_P=${PN}_${PV}
+SLOT="2.6"
+MY_P="${PN}_${PV}"
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
+HOMEPAGE="http://fixounet.free.fr/${PN}"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-# Multiple licenses because of all the bundled stuff
-LICENSE="GPL-2 MIT GPL-1 public-domain PSF-2"
-SLOT="2.6"
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig gtk jack
- lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
RDEPEND="
- virtual/libiconv
+ >=dev-lang/spidermonkey-1.5-r2
dev-libs/libxml2
media-libs/libpng
- >=dev-lang/spidermonkey-1.5-r2
- gtk? ( >=x11-libs/gtk+-2.6.0:2 )
- qt4? ( >=dev-qt/qtgui-4.8.3:4 )
- x264? ( media-libs/x264 )
- xvid? ( media-libs/xvid )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ virtual/libiconv
aften? ( media-libs/aften )
+ alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
amr? ( media-libs/opencore-amr )
- lame? ( media-sound/lame )
dts? ( media-libs/libdca )
- vorbis? ( media-libs/libvorbis )
- alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+ fontconfig? ( media-libs/fontconfig )
+ gtk? ( >=x11-libs/gtk+-2.6.0:2 )
jack? (
media-sound/jack-audio-connection-kit
libsamplerate? ( media-libs/libsamplerate )
)
- truetype? ( >=media-libs/freetype-2.1.5 )
- fontconfig? ( media-libs/fontconfig )
+ lame? ( media-sound/lame )
+ qt4? ( >=dev-qt/qtgui-4.8.3:4 )
sdl? ( media-libs/libsdl )
+ truetype? ( >=media-libs/freetype-2.1.5 )
+ x264? ( media-libs/x264 )
xv? ( x11-libs/libXv )
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
+ xvid? ( media-libs/xvid )
+ vorbis? ( media-libs/libvorbis )
"
DEPEND="
$RDEPEND
oss? ( virtual/os-headers )
- virtual/pkgconfig
nls? ( sys-devel/gettext )
+ virtual/pkgconfig
"
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-avidemux_build_process() {
- local BUILDDIR="${1}"
- local SOURCEDIR="${2}"
- local mycmakeargs="${3}"
- EXTRA="${mycmakeargs}"
- BUILDER="Unix Makefiles"
- FAKEROOT_DIR="${S}"/gentoo-install
- SOURCEDIR="${2}"
- mkdir ${BUILDDIR} && cd "${BUILDDIR}"
- einfo "Configuring: ${BUILDDIR}"
- cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- ${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/"
- # for some reason, core needs -j1. That's what they do in their
- # script as well
- if [[ ${BUILDDIR} == "buildCore" ]]; then
- extra_opts="-j1"
- else
- unset extra_opts
- fi
- einfo "Building: ${BUILDDIR}"
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts}
- einfo "Fake install: ${BUILDDIR}"
- # pretend that you installed it somewhere
- emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install
+S="${WORKDIR}/${MY_P}"
+BUILD_S="${WORKDIR}/${P}_build"
- cd ..
-}
+PROCESSES="buildCore:avidemux_core${POSTFIX}
+ buildCli:avidemux/cli${POSTFIX}
+ buildPluginsCommon:avidemux_plugins${POSTFIX}
+ buildPluginsCLI:avidemux_plugins${POSTFIX}"
+
+use qt4 && PROCESSES+=" buildQt4:avidemux/qt4${POSTFIX}
+ buildPluginsQt4:avidemux_plugins${POSTFIX}"
+
+use gtk && PROCESSES+=" buildGtk:avidemux/gtk${POSTFIX}
+ buildPluginsGtk:avidemux_plugins${POSTFIX}"
src_prepare() {
base_src_prepare
@@ -105,43 +87,33 @@ src_prepare() {
done
sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
- "${S}/cmake/Po.cmake" || die "sed failed"
+ "${S}/cmake/Po.cmake" || die "po_files sed failed"
+
sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
- "${S}/cmake/Ts.cmake" || die "sed failed"
+ "${S}/cmake/Ts.cmake" || die "ts_files sed failed"
# Fix icon name -> avidemux-2.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
- # the desktop file is broken. It uses avidemux2 instead of avidemux3
- # so it will actually launch avidemux-2.5 if it is installed
- sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die
- # Now rename to not collide with 2.5
- mv ${PN}2.desktop ${PN}-2.6.desktop
- # fix major issues in desktop files wrt bugs #291453, #316599, #430500
- # duplicate desktop file
- cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
- # the desktop file is broken. It uses avidemux2 instead of avidemux3
- # so it will actually launch avidemux-2.5 if it is installed
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die
-}
+ sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
-src_configure() {
- true;
-}
+ # The desktop file is broken. It uses avidemux2 instead of avidemux3
+ # so it will actually launch avidemux-2.5 if it is installed.
+ sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-src_compile() {
- # add lax vector typing for PowerPC
- if use ppc || use ppc64; then
- append-cflags -flax-vector-conversions
- fi
- # bug 432322
- use x86 && replace-flags -O0 -O1
+ # Now rename the desktop file to not collide with 2.5.
+ mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+ # Fix major issues in desktop files wrt bugs #291453, #316599, #430500
+ # duplicate desktop file.
+ cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die "Desktop file copy failed."
- local x mycmakeargs
- # default args
- use debug \
- && POSTFIX="_debug" \
- && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+ # The desktop file is broken. It uses avidemux2 instead of avidemux3
+ # so it will actually launch avidemux-2.5 if it is installed.
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed."
+}
+
+src_configure() {
+ local x mycmakeargs plugin_ui
mycmakeargs="
$(for x in ${IUSE}; do cmake-utils_use $x; done)
@@ -152,41 +124,79 @@ src_compile() {
$(cmake-utils_use amr OPENCORE_AMRWB)
$(cmake-utils_use amr OPENCORE_AMRNB)
"
+ use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+ for PROCESS in ${PROCESSES} ; do
+ SOURCE="${PROCESS%%:*}"
+ DEST="${PROCESS#*:}"
+
+ cd "${S}" || die "Can't enter source folder."
+ mkdir "${SOURCE}" || die "Can't create build folder."
+ cd "${SOURCE}" || die "Can't enter build folder."
+
+ if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
+ plugin_ui="-DPLUGIN_UI=COMMON"
+ elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
+ plugin_ui="-DPLUGIN_UI=CLI"
+ elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
+ plugin_ui="-DPLUGIN_UI=QT4"
+ elif [[ "${SOURCE}" == "buildPluginsGtk" ]]; then
+ plugin_ui="-DPLUGIN_UI=GTK"
+ fi
- # Lets try to do all the s**t that bootStrap.bash is
- # trying to do
- use qt4 && with_qt4=1
- use gtk && with_gtk=1
-
- avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}"
- avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}"
- mycmakeargs+="-DPLUGIN_UI=COMMON "
- avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}"
- mycmakeargs+="-DPLUGIN_UI=CLI "
- avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}"
-
- if use qt4; then
- avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
- mycmakeargs+="-DPLUGIN_UI=QT4 "
- avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
- fi
- if use gtk; then
- avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}"
- mycmakeargs+="-DPLUGIN_UI=GTK "
- avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
+ cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ ${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}/"
+ done
+}
+
+src_compile() {
+ # Add lax vector typing for PowerPC.
+ if use ppc || use ppc64 ; then
+ append-cflags -flax-vector-conversions
fi
+
+ # See bug 432322.
+ use x86 && replace-flags -O0 -O1
+
+ for PROCESS in ${PROCESSES} ; do
+ SOURCE="${PROCESS%%:*}"
+
+ cd "${S}/${SOURCE}" || die "Can't enter build folder."
+
+ if [[ "${SOURCE}" == "buildCore" ]] ; then
+ # TODO: Report this upstream, seems to be within ffmpeg code.
+ emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ else
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ fi
+ done
}
src_install() {
- # everything is installed(?) in ${S}/gentoo-install.
- # Move it to ${D}.
- insinto /
- doins -r "${S}"/gentoo-install/*
- # Mark executables with +x
- find "${ED}"/usr/bin -exec chmod a+x {} \;
+ for PROCESS in ${PROCESSES} ; do
+ SOURCE="${PROCESS%%:*}"
+
+ cd "${S}/${SOURCE}" || die "Can't enter build folder."
+
+ if [[ "${SOURCE}" == "buildCore" ]] ; then
+ # TODO: Report this upstream, seems to be within ffmpeg code.
+ emake DESTDIR="${ED}" -j1 install
+ else
+ emake DESTDIR="${ED}" install
+ fi
+ done
+
+ cd "${S}" || die "Can't enter source folder."
+
+ fperms +x /usr/bin/avidemux3_cli
+ fperms +x /usr/bin/avidemux3_jobs
+ use gtk && fperms +x /usr/bin/avidemux3_gtk
+ use qt4 && fperms +x /usr/bin/avidemux3_qt4
newicon ${PN}_icon.png ${PN}-2.6.png
use gtk && domenu ${PN}-2.6-gtk.desktop
use qt4 && domenu ${PN}-2.6.desktop
+
dodoc AUTHORS README
}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6e9505606dd5..967205332f45 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,5 +1,4 @@
DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
DIST ffmpeg-0.10.6.tar.bz2 5778721 SHA256 8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626 SHA512 f563bd8aa0daa982a7f63560b7c1ed5d630976aac2efb9b37031923d078bb7111fa96f7a05f241743eb0eafb071d439e90a87c9377cd6db70ad0df7599a0a0c8 WHIRLPOOL fef0f748276250e47e6ac30aad31f2a50ebb222aa989b48f82408eb9ab3cba77a07fecd9a67f05ae32dbe8fe95b65a6156cade2cd477e14c0d827087887cbc91
-DIST ffmpeg-1.0.4.tar.bz2 6448411 SHA256 15f46524195b2c88973585ab29416badd86a92040e96ec38b7df0b4536ba3e53 SHA512 dece791af5f9e99ed0f5697668646ea810105e5f1baa9f56245a1b794f7ae0c4f7c604b7146b44cd7e8ad9cef2751ed93677a112ef6dd9fca2118c2f34137ecc WHIRLPOOL 65e0769bdc8a6d90a837a7c1ae3956b2927cc87f2ef13f5e6ee2b82f79fe0d222a3e70db8bb41160cdcd8ccd98c07f3e03572b68807a0d8cd7f3b23a2a3b9010
-DIST ffmpeg-1.1.2.tar.bz2 5810976 SHA256 dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce SHA512 b947d18c7ea7d371e772c97873b180c00b94025a8546eb4663e42f37fbf66d52b1ea8241219b6c4700bd8c12cfb6af12fb7d823f7632061c447e2d95e30f83aa WHIRLPOOL 41d49b5d7eb0667b48b8292b5cc89dabf3a52d6cfc7bb27137546efa41ccc9f6ccc0f2a0a53162d93cefdcc2cfd130c039b298f5c1eab113a8af0a36380ee04d
+DIST ffmpeg-1.0.5.tar.bz2 6449133 SHA256 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce SHA512 0d380fc547e83f49df54313f23d31aea4d617d5cced067c392e997d7bc5d89e230522174977f68a826d17eab07d5f4be3886aa6df6d634c24dae8000dd5b3172 WHIRLPOOL a60a72cf55c603803629c83c247474fa98ffe2f7632e3df18dbf5875b3d69b61f228d4bb9499218f18e010c8b77d6ee768e7877ca05c145fe46f51e6a39c3553
DIST ffmpeg-1.1.3.tar.bz2 5812644 SHA256 a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 SHA512 56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 WHIRLPOOL 066b1d1e1eee7d96b32b4005760eff34c4d6878821ad5037e4d7b2068dcbf9bd94c83d123a033dcf0f1840c63a4e3e94d011bbde0ce47f2e020644edfe731f6a
diff --git a/media-video/ffmpeg/ffmpeg-1.0.4.ebuild b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-1.0.4.ebuild
rename to media-video/ffmpeg/ffmpeg-1.0.5.ebuild
index c572bee7dd8f..46e4deff2db8 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.4.ebuild,v 1.3 2013/02/23 13:24:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.5.ebuild,v 1.1 2013/03/04 10:58:00 aballier Exp $
EAPI="4"
diff --git a/media-video/ffmpeg/ffmpeg-1.1.2.ebuild b/media-video/ffmpeg/ffmpeg-1.1.2.ebuild
deleted file mode 100644
index 9bc6221c029e..000000000000
--- a/media-video/ffmpeg/ffmpeg-1.1.2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.2.ebuild,v 1.3 2013/02/22 19:08:22 zmedico Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-2"
- EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
- aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
- cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
- gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
- libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp
- schroedinger sdl speex static-libs test theora threads truetype twolame v4l
- vaapi vdpau vorbis vpx X x264 xvid +zlib
- "
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
- IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
- IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- bluray? ( media-libs/libbluray )
- bzip2? ( app-arch/bzip2 )
- cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 )
- encode? (
- aac? ( media-libs/vo-aacenc )
- aacplus? ( media-libs/libaacplus )
- amr? ( media-libs/vo-amrwbenc )
- faac? ( media-libs/faac )
- fdk? ( media-libs/fdk-aac )
- mp3? ( >=media-sound/lame-3.98.3 )
- theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
- twolame? ( media-sound/twolame )
- x264? ( >=media-libs/x264-0.0.20111017 )
- xvid? ( >=media-libs/xvid-1.1.0 )
- )
- flite? ( app-accessibility/flite )
- fontconfig? ( media-libs/fontconfig )
- frei0r? ( media-plugins/frei0r-plugins )
- gnutls? ( >=net-libs/gnutls-2.12.16 )
- gsm? ( >=media-sound/gsm-1.0.12-r1 )
- iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
- libass? ( media-libs/libass )
- libcaca? ( media-libs/libcaca )
- libv4l? ( media-libs/libv4l )
- modplug? ( media-libs/libmodplug )
- openal? ( >=media-libs/openal-1.1 )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- rtmp? ( >=media-video/rtmpdump-2.2f )
- sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
- schroedinger? ( media-libs/schroedinger )
- speex? ( >=media-libs/speex-1.2_beta3 )
- truetype? ( media-libs/freetype:2 )
- vaapi? ( >=x11-libs/libva-0.32 )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- vpx? ( >=media-libs/libvpx-0.9.6 )
- X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
- zlib? ( sys-libs/zlib )
- !media-video/qt-faststart
- !media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- doc? ( app-text/texi2html )
- fontconfig? ( virtual/pkgconfig )
- gnutls? ( virtual/pkgconfig )
- ieee1394? ( virtual/pkgconfig )
- libv4l? ( virtual/pkgconfig )
- mmx? ( dev-lang/yasm )
- rtmp? ( virtual/pkgconfig )
- schroedinger? ( virtual/pkgconfig )
- test? ( net-misc/wget )
- truetype? ( virtual/pkgconfig )
- v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
- if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
-}
-
-src_configure() {
- local myconf="${EXTRA_FFMPEG_CONF}"
- # Set to --enable-version3 if (L)GPL-3 is required
- local version3=""
-
- # enabled by default
- for i in debug doc network vaapi vdpau zlib; do
- use ${i} || myconf="${myconf} --disable-${i}"
- done
- use bzip2 || myconf="${myconf} --disable-bzlib"
- use sdl || myconf="${myconf} --disable-ffplay"
-
- use cpudetection || myconf="${myconf} --disable-runtime-cpudetect"
- use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
- for i in gnutls ; do
- use $i && myconf="${myconf} --enable-$i"
- done
-
- # Encoders
- if use encode
- then
- use mp3 && myconf="${myconf} --enable-libmp3lame"
- use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
- use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
- for i in theora twolame x264 xvid; do
- use ${i} && myconf="${myconf} --enable-lib${i}"
- done
- use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
- use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
- use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree"
- else
- myconf="${myconf} --disable-encoders"
- fi
-
- # libavdevice options
- for i in cdio iec61883 ; do
- use ${i} && myconf="${myconf} --enable-lib${i}"
- done
- use ieee1394 && myconf="${myconf} --enable-libdc1394"
- use libcaca && myconf="${myconf} --enable-libcaca"
- use openal && myconf="${myconf} --enable-openal"
- # Indevs
- use v4l || myconf="${myconf} --disable-indev=v4l2"
- for i in alsa oss jack ; do
- use ${i} || myconf="${myconf} --disable-indev=${i}"
- done
- use X && myconf="${myconf} --enable-x11grab"
- use pulseaudio && myconf="${myconf} --enable-libpulse"
- use libv4l && myconf="${myconf} --enable-libv4l2"
- # Outdevs
- for i in alsa oss sdl ; do
- use ${i} || myconf="${myconf} --disable-outdev=${i}"
- done
- # libavfilter options
- for i in frei0r fontconfig libass ; do
- use ${i} && myconf="${myconf} --enable-${i}"
- done
- use truetype && myconf="${myconf} --enable-libfreetype"
- use flite && myconf="${myconf} --enable-libflite"
-
- # Threads; we only support pthread for now but ffmpeg supports more
- use threads && myconf="${myconf} --enable-pthreads"
-
- # Decoders
- use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
- for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
- use ${i} && myconf="${myconf} --enable-lib${i}"
- done
- use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
- # CPU features
- for i in ${CPU_FEATURES}; do
- use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
- done
- if use pic ; then
- myconf="${myconf} --enable-pic"
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- use x86 && myconf="${myconf} --disable-asm"
- fi
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host" # bug #273421
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- # Mandatory configuration
- myconf="
- --enable-gpl
- ${version3}
- --enable-postproc
- --enable-avfilter
- --disable-stripping
- ${myconf}"
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
- case ${CHOST} in
- *freebsd*)
- myconf="${myconf} --target-os=freebsd"
- ;;
- mingw32*)
- myconf="${myconf} --target-os=mingw32"
- ;;
- *linux*)
- myconf="${myconf} --target-os=linux"
- ;;
- esac
- fi
-
- # avresample support for libav compatibility
- use avresample && myconf="${myconf} --enable-avresample"
-
- # Misc stuff
- use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
- cd "${S}"
- ./configure \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- $(use_enable static-libs static) \
- ${myconf} || die
-}
-
-src_compile() {
- emake V=1
-
- for i in ${FFTOOLS} ; do
- if use fftools_$i ; then
- emake V=1 tools/$i
- fi
- done
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" install install-man
-
- dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
- use doc && dohtml -r doc/*
- if use examples ; then
- insinto "/usr/share/doc/${PF}/examples"
- doins -r doc/examples/*
- fi
-
- for i in ${FFTOOLS} ; do
- if use fftools_$i ; then
- dobin tools/$i
- fi
- done
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index dc98deea08a2..a799e4cb6ed9 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.116 2013/02/22 19:08:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.120 2013/03/04 12:09:04 aballier Exp $
EAPI="4"
@@ -31,10 +31,10 @@ fi
IUSE="
aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
- gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
- libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio
- rtmp schroedinger sdl speex static-libs test theora threads truetype twolame
- v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+ gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
+ libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
+ pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
+ truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
"
# String for CPU features in the useflag[:configure_option] form
@@ -75,6 +75,7 @@ RDEPEND="
frei0r? ( media-plugins/frei0r-plugins )
gnutls? ( >=net-libs/gnutls-2.12.16 )
gsm? ( >=media-sound/gsm-1.0.12-r1 )
+ iconv? ( virtual/libiconv )
iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
jack? ( media-sound/jack-audio-connection-kit )
@@ -123,6 +124,7 @@ REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
test? ( encode )"
S=${WORKDIR}/${P/_/-}
+BUILD_DIR=${S}_build
src_prepare() {
if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
@@ -132,12 +134,15 @@ src_prepare() {
}
src_configure() {
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+
local myconf="${EXTRA_FFMPEG_CONF}"
# Set to --enable-version3 if (L)GPL-3 is required
local version3=""
# enabled by default
- for i in debug doc network vaapi vdpau zlib; do
+ for i in debug doc network zlib; do
use ${i} || myconf="${myconf} --disable-${i}"
done
use bzip2 || myconf="${myconf} --disable-bzlib"
@@ -145,7 +150,8 @@ src_configure() {
use cpudetection || myconf="${myconf} --disable-runtime-cpudetect"
use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
- for i in gnutls ; do
+ # disabled by default
+ for i in gnutls iconv vaapi vdpau ; do
use $i && myconf="${myconf} --enable-$i"
done
@@ -256,8 +262,7 @@ src_configure() {
# Misc stuff
use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
- cd "${S}"
- ./configure \
+ "${S}/configure" \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/$(get_libdir)" \
--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -274,6 +279,7 @@ src_configure() {
}
src_compile() {
+ cd "${BUILD_DIR}"
emake V=1
for i in ${FFTOOLS} ; do
@@ -284,23 +290,26 @@ src_compile() {
}
src_install() {
+ cd "${BUILD_DIR}"
emake V=1 DESTDIR="${D}" install install-man
- dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
- use doc && dohtml -r doc/*
- if use examples ; then
- insinto "/usr/share/doc/${PF}/examples"
- doins -r doc/examples/*
- fi
-
for i in ${FFTOOLS} ; do
if use fftools_$i ; then
dobin tools/$i
fi
done
+
+ cd "${S}"
+ dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+ use doc && dohtml -r doc/*
+ if use examples ; then
+ dodoc -r doc/examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
}
src_test() {
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil:${S}/libavresample" \
+ cd "${BUILD_DIR}"
+ LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
emake V=1 fate
}
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index 97966e6b61f9..276e593205a6 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -1,5 +1,6 @@
- video
+ video
+ kde
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 87fb5d10ad3d..f9fb2ad64f7e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 04 Mar 2013 09:06:58 +0000
+Mon, 04 Mar 2013 19:06:57 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 87fb5d10ad3d..f9fb2ad64f7e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 04 Mar 2013 09:06:58 +0000
+Mon, 04 Mar 2013 19:06:57 +0000
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.4 b/metadata/md5-cache/app-admin/apache-tools-2.4.4
index 6dcb48b96112..6d7f2506e0ea 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.4
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
EAPI=3
HOMEPAGE=http://httpd.apache.org/
IUSE=ssl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
LICENSE=Apache-2.0
RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/libpcre ssl? ( dev-libs/openssl )
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/httpd/httpd-2.4.4.tar.bz2
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=372e86f4f4437a5e9b0f448ea3908d59
+_md5_=957742906b96ac7d13eb0a51e11df879
diff --git a/metadata/md5-cache/app-admin/eselect-renpy-0.2 b/metadata/md5-cache/app-admin/eselect-renpy-0.2
new file mode 100644
index 000000000000..a7a0dc632bfa
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-renpy-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Manages renpy symlink
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect-lib-bin-symlink
+SLOT=0
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 2824df7f5dc9f47aee293af8a6b517ed games e0a83e3f3f024b8c8ef7a8217d716cbf multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0008b7496ce0ef672184749ab59377c
diff --git a/metadata/md5-cache/app-arch/advancecomp-1.16 b/metadata/md5-cache/app-arch/advancecomp-1.16
new file mode 100644
index 000000000000..355c17e11f9b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/advancecomp-1.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=app-arch/bzip2 sys-libs/zlib
+DESCRIPTION=Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression
+EAPI=5
+HOMEPAGE=http://advancemame.sourceforge.net/comp-readme.html
+IUSE=png mng
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/advancemame/advancecomp-1.16.tar.gz
+_md5_=6e5b4f617ff63f0269e4a5d75d7579a3
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.5.0 b/metadata/md5-cache/app-cdr/kcdemu-0.5.0
new file mode 100644
index 000000000000..b177c6e5ced4
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A frontend to cdemu daemon for KDE4
+EAPI=5
+HOMEPAGE=http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752
+IUSE=debug linguas_de linguas_es linguas_pl linguas_ro linguas_sv aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-cdr/cdemu-2.0.0[cdemu-daemon] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.5.0.tar.bz2 -> kcdemu-0.5.0.tar.gz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=72399897bf0fdcace997e6cc08234879
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.25 b/metadata/md5-cache/app-emulation/wine-1.5.25
index 4b4a21dab808..317f8fa8f97a 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.25
+++ b/metadata/md5-cache/app-emulation/wine-1.5.25
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) app-emulation/emul-linux-x86-baselibs[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix
EAPI=5
HOMEPAGE=http://www.winehq.org/
IUSE=+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +X xcomposite xinerama xml pulseaudio abi_x86_32 abi_x86_64 abi_x86_x32 test
KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
LICENSE=LGPL-2.1
-RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) app-emulation/emul-linux-x86-baselibs[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit )
+RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit )
REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.25.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-multilib 29c1ade1d510f9d8be6ed59348b03de6 autotools-utils c3608254689d959486b175186734d10d eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multilib-build 3bc9522b0a12b7d4a719c56dda9e5873 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7c9a8940069abd3120509b468466c5da
+_md5_=879f7f32a3632eb1b5c40f5d8f63a1ce
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index a3e90c3994d8..da2ee56b9f2f 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) app-emulation/emul-linux-x86-baselibs[development] >=sys-kernel/linux-headers-2.6 ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
+DEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) virtual/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
DESCRIPTION=Free implementation of Windows(tm) on Unix
EAPI=5
HOMEPAGE=http://www.winehq.org/
IUSE=+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +X xcomposite xinerama xml abi_x86_32 abi_x86_64 abi_x86_x32 test
LICENSE=LGPL-2.1
-RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) app-emulation/emul-linux-x86-baselibs[development] >=sys-kernel/linux-headers-2.6 ) )
+RDEPEND=truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) udisks? ( sys-apps/dbus sys-fs/udisks:2 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:0= ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( dev-libs/openssl:0= net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) xcomposite? ( x11-libs/libXcomposite ) amd64? ( abi_x86_32? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] >=app-emulation/emul-linux-x86-soundlibs-2.1[development] ) mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) odbc? ( app-emulation/emul-linux-x86-db[development] ) openal? ( app-emulation/emul-linux-x86-sdl[development] ) opengl? ( app-emulation/emul-linux-x86-opengl[development] ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) >=app-emulation/emul-linux-x86-baselibs-20130224[development] >=sys-kernel/linux-headers-2.6 ) )
REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) osmesa? ( opengl )
RESTRICT=test
SLOT=0
SRC_URI=gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.5.25.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-multilib 29c1ade1d510f9d8be6ed59348b03de6 autotools-utils c3608254689d959486b175186734d10d eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multilib-build 3bc9522b0a12b7d4a719c56dda9e5873 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=805c320b31593949e134b4ee57ac251b
+_md5_=b5f0434325bb34405ccce300ae49edf6
diff --git a/metadata/md5-cache/app-i18n/scim-tables-0.5.12 b/metadata/md5-cache/app-i18n/scim-tables-0.5.12
new file mode 100644
index 000000000000..00a83142b63e
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/scim-tables-0.5.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup unpack
+DEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Smart Common Input Method (SCIM) Generic Table Input Method Server
+HOMEPAGE=http://www.scim-im.org/
+IUSE=nls linguas_am linguas_ar linguas_bn linguas_gu linguas_hi linguas_ja linguas_kn linguas_ko linguas_ml linguas_ne linguas_pa linguas_ru linguas_ta linguas_te linguas_th linguas_uk linguas_vi linguas_zh
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-i18n/scim-1.4.7-r2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/scim/scim-tables-0.5.12.tar.gz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0777bf1028a02f3767843cb957820968
diff --git a/metadata/md5-cache/app-text/kchmviewer-6.0-r1 b/metadata/md5-cache/app-text/kchmviewer-6.0-r1
index 886b0d00fc92..cc68ef2ada6c 100644
--- a/metadata/md5-cache/app-text/kchmviewer-6.0-r1
+++ b/metadata/md5-cache/app-text/kchmviewer-6.0-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/chmlib >=dev-qt/qtdbus-4.5:4 >=dev-qt/qtwebkit-4.5:4 !kde? ( >=dev-qt/qtgui-4.5:4 ) kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=KchmViewer is a feature rich chm file viewer, based on Qt.
-EAPI=4
+DEPEND=dev-libs/chmlib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+DESCRIPTION=A feature rich chm file viewer, based on Qt.
+EAPI=5
HOMEPAGE=http://www.kchmviewer.net/
-IUSE=debug kde linguas_cs linguas_fr linguas_hu linguas_it linguas_nl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW aqua
+IUSE=debug kde linguas_cs linguas_fr linguas_hu linguas_it linguas_nl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua kde
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-3
-RDEPEND=dev-libs/chmlib >=dev-qt/qtdbus-4.5:4 >=dev-qt/qtwebkit-4.5:4 !kde? ( >=dev-qt/qtgui-4.5:4 ) kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] )
+RDEPEND=dev-libs/chmlib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) 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_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) 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_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) 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_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
SLOT=0
SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-6.0.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b qt4-r2 19af9102ca9b827213997cc636e7e33c toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6d16359656542d2f2af7bd0ffa9f2884
+_md5_=be9c0951220e62074a7170f885344aad
diff --git a/metadata/md5-cache/app-text/landslide-1.1.1 b/metadata/md5-cache/app-text/landslide-1.1.1
index 075762caafd6..50f8636a72ed 100644
--- a/metadata/md5-cache/app-text/landslide-1.1.1
+++ b/metadata/md5-cache/app-text/landslide-1.1.1
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
DESCRIPTION=Landslide generates a slideshow using the slides that power the html5-slides presentation
EAPI=3
HOMEPAGE=https://github.com/adamzap/landslide
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=Apache-2.0
RDEPEND=dev-python/docutils dev-python/jinja dev-python/markdown dev-python/pygments =dev-lang/python-2*
SLOT=0
SRC_URI=https://github.com/adamzap/landslide/tarball/v1.1.1 -> landslide-1.1.1.tar.gz
_eclasses_=distutils 77fc6005d2dfcc7bdb5ec363a49d9912 multilib ded93e450747134a079e647d888aa80b python 89dff4d72d57f253f9f78b7f8c5d55c8 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e vcs-snapshot 3facff03591093044e38f21285a02129
-_md5_=fa8a14a2005d7131a7a576f2f8737992
+_md5_=8a235cb198160db7930a83b0c3518a35
diff --git a/metadata/md5-cache/app-text/lv-4.51-r3 b/metadata/md5-cache/app-text/lv-4.51-r3
index 51686483d341..72b697c5d151 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r3
+++ b/metadata/md5-cache/app-text/lv-4.51-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses !app-editors/levee dev-lang/perl
+DEPEND=sys-libs/ncurses !app-editors/levee dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Powerful Multilingual File Viewer
EAPI=4
HOMEPAGE=http://www.ff.iij4u.or.jp/~nrt/lv/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=sys-libs/ncurses !app-editors/levee
SLOT=0
SRC_URI=http://www.ff.iij4u.or.jp/~nrt/freeware/lv451.tar.gz
-_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8afd23e2ed23fadcdb542e55ca76b64a
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=31fccad6f77e247e40b680d4171d4e1f
diff --git a/metadata/md5-cache/app-text/multitail-5.2.12 b/metadata/md5-cache/app-text/multitail-5.2.12
index 367c302a8ba8..d2fd0db57dc2 100644
--- a/metadata/md5-cache/app-text/multitail-5.2.12
+++ b/metadata/md5-cache/app-text/multitail-5.2.12
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses
+DEPEND=sys-libs/ncurses virtual/pkgconfig
DESCRIPTION=Tail with multiple windows
EAPI=5
HOMEPAGE=http://www.vanheusden.com/multitail/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=http://www.vanheusden.com/multitail/multitail-5.2.12.tgz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=188f6da79952d3e9aff01578d1d4a759
+_md5_=88d2fe24090d5c1524c28acee78d64f6
diff --git a/metadata/md5-cache/dev-lang/php-5.3.22 b/metadata/md5-cache/dev-lang/php-5.3.22
new file mode 100644
index 000000000000..71297d6c4a30
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.3.22
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite2 sqlite ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=PHP-3
+PDEPEND=doc? ( app-doc/php-docs )
+RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=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 ) ) ) ) )
+SLOT=5.3
+SRC_URI=http://www.php.net/distributions/php-5.3.22.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3-r0.tar.bz2
+_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools cf83655b19ed98f9ea3b44f4572b51a3 db-use 2f5d6a2718559b90a51648d8ff58be83 depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=5876c47833d9ff820c46dd6d80a5a90e
diff --git a/metadata/md5-cache/dev-lang/php-5.4.12 b/metadata/md5-cache/dev-lang/php-5.4.12
new file mode 100644
index 000000000000..fda5fff81b87
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.4.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3
+PDEPEND=doc? ( app-doc/php-docs )
+RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=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 ) ) ) ) )
+SLOT=5.4
+SRC_URI=http://www.php.net/distributions/php-5.4.12.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools cf83655b19ed98f9ea3b44f4572b51a3 db-use 2f5d6a2718559b90a51648d8ff58be83 depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=ed4638f460adfdd16914d07ec27b367c
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p371 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
index 224eafe235e5..815e406cf043 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p371
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
EAPI=2
HOMEPAGE=http://www.ruby-lang.org/
IUSE=+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=|| ( Ruby GPL-2 )
PDEPEND=xemacs? ( app-xemacs/ruby-modes )
RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++ library that provides ability to work natively with UTF8 strings in a very simple way.
+EAPI=5
+HOMEPAGE=http://grigory.info/UTF8Strings.About.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://grigory.info/distfiles/UTF8Strings-1.13.0.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f086f05a9c9a2204d2ba8fdaf2d832a3
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.26.1 b/metadata/md5-cache/dev-libs/angelscript-2.26.1
new file mode 100644
index 000000000000..37b6ab57915d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/angelscript-2.26.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A flexible, cross-platform scripting library
+EAPI=5
+HOMEPAGE=http://www.angelcode.com/angelscript/
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.26.1.zip
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f00e6fbbbfadf4697c0d93c24070925e
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1 b/metadata/md5-cache/dev-libs/libindicate-12.10.1
new file mode 100644
index 000000000000..259ee887a20e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A library to raise flags on DBus for other components of the desktop to pick up and visualize
+EAPI=5
+HOMEPAGE=http://launchpad.net/libindicate
+IUSE=gtk +introspection
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 LGPL-3
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=PHP extension that provides access to movie info.
+EAPI=3
+HOMEPAGE=http://sourceforge.net/projects/ffmpeg-php/
+IUSE=php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/ffmpeg dev-lang/php[gd] || ( =dev-php/ffmpeg-php-0.6.0-r2[php_targets_php5-3] =dev-php/ffmpeg-php-0.6.0-r2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bc7aa2e6296b57bc931d12302f336d07
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.7 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.7
new file mode 100644
index 000000000000..20df139cb5df
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=PHP extension for using memcached.
+EAPI=5
+HOMEPAGE=http://pecl.php.net/memcache
+IUSE=+session php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+LICENSE=PHP-3
+RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.7[php_targets_php5-3] =dev-php/pecl-memcache-3.0.7[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://pecl.php.net/get/memcache-3.0.7.tgz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b76f8c53d374cc440d181b60bb0576e0
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.12 b/metadata/md5-cache/dev-php/pecl-ssh2-0.12
new file mode 100644
index 000000000000..cad3b89426cc
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=net-libs/libssh2-1.2 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=Provides bindings to the functions of libssh2 which implements the SSH2 protocol.
+EAPI=5
+HOMEPAGE=http://pecl.php.net/ssh2
+IUSE=php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3
+RDEPEND=>=net-libs/libssh2-1.2 || ( =dev-php/pecl-ssh2-0.12[php_targets_php5-3] =dev-php/pecl-ssh2-0.12[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/ssh2-0.12.tgz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=519d4b83f46472a13004ae8615c8a48a
diff --git a/metadata/md5-cache/dev-php/pecl-zendoptimizerplus-7.0.0 b/metadata/md5-cache/dev-php/pecl-zendoptimizerplus-7.0.0
new file mode 100644
index 000000000000..54c5cee92d0c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-zendoptimizerplus-7.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=The Zend Optimizer+ provides faster PHP execution through opcode caching and optimization.
+EAPI=5
+HOMEPAGE=http://pecl.php.net/zendoptimizerplus
+IUSE=php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64
+LICENSE=PHP-3
+RDEPEND=|| ( =dev-php/pecl-zendoptimizerplus-7.0.0[php_targets_php5-3] =dev-php/pecl-zendoptimizerplus-7.0.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/zendoptimizerplus-7.0.0.tgz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=59accc0930e85ba02421ca17d7f97c4c
diff --git a/metadata/md5-cache/dev-python/starcluster-0.93.3 b/metadata/md5-cache/dev-python/starcluster-0.93.3
index aa5c8b07377f..8fe60a14aa77 100644
--- a/metadata/md5-cache/dev-python/starcluster-0.93.3
+++ b/metadata/md5-cache/dev-python/starcluster-0.93.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 =dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta =dev-python/workerpool-0.9.2 doc? ( dev-python/sphinx dev-python/epydoc dev-python/matplotlib ) dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
+DEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6-r1 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta =dev-python/workerpool-0.9.2 doc? ( dev-python/sphinx dev-python/epydoc dev-python/matplotlib ) dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
DESCRIPTION=Utility for creating / managing general purpose computing clusters
EAPI=4
HOMEPAGE=http://web.mit.edu/star/cluster
IUSE=doc bash-completion epydoc test
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
-RDEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 =dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta =dev-python/workerpool-0.9.2 =dev-lang/python-2*
+RDEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6-r1 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta =dev-python/workerpool-0.9.2 =dev-lang/python-2*
SLOT=0
SRC_URI=mirror://pypi/S/StarCluster/StarCluster-0.93.3.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 distutils 77fc6005d2dfcc7bdb5ec363a49d9912 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python 89dff4d72d57f253f9f78b7f8c5d55c8 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bed6ed3851a86a23c9a0958dea8a2bb5
+_md5_=6f977e917b9c29019d052cab1bc842cf
diff --git a/metadata/md5-cache/dev-ruby/crack-0.3.2 b/metadata/md5-cache/dev-ruby/crack-0.3.2
index a1681bb74d6d..56c3d92dca18 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.3.2
+++ b/metadata/md5-cache/dev-ruby/crack-0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Really simple JSON and XML parsing, ripped from Merb and Rails.
EAPI=2
HOMEPAGE=https://github.com/jnunemaker/crack
IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
SLOT=0
SRC_URI=mirror://rubygems/crack-0.3.2.gem
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed java-utils-2 dcda71e114d638cdf01db57b8445337d multilib ded93e450747134a079e647d888aa80b ruby-fakegem d2a1d4e0903b29b09c892b21b79fcf46 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=020cf3f5611a2b3e846760303441dee8
+_md5_=cacf5d8f5a802ea25291b1237898b89f
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
index f9257cf988be..99eeae865c94 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A robust library for verifying and serving OpenID identities
EAPI=4
HOMEPAGE=http://ruby-openid.rubyforge.org/
IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-macos
LICENSE=GPL-2
RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
SLOT=0
SRC_URI=mirror://rubygems/ruby-openid-2.2.2.gem
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed java-utils-2 dcda71e114d638cdf01db57b8445337d multilib ded93e450747134a079e647d888aa80b ruby-fakegem d2a1d4e0903b29b09c892b21b79fcf46 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=1a2e6a5caa16557d3d5bb4ffff7d1771
+_md5_=49cfe80c007ee10348c887e9fe4f3680
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.1.5 b/metadata/md5-cache/dev-vcs/git-1.8.1.5
index e871e2d8d506..b2470f7b56ce 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.1.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
EAPI=4
HOMEPAGE=http://www.git-scm.com/
IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
SLOT=0
SRC_URI=http://git-core.googlecode.com/files/git-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.1.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.1.5.tar.gz )
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 elisp-common 21605c8f0b2a5ffa3233faeb3f9df309 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module 825d3d7654c88c5c4dec7400d3612578 python 89dff4d72d57f253f9f78b7f8c5d55c8 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4803182341d131861dd483c8eb6cbbd0
+_md5_=564d0bf1b971cada7c58b50e9e77eff5
diff --git a/metadata/md5-cache/games-engines/renpy-6.15.0 b/metadata/md5-cache/games-engines/renpy-6.15.0
new file mode 100644
index 000000000000..38371404d1ff
--- /dev/null
+++ b/metadata/md5-cache/games-engines/renpy-6.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-admin/eselect-renpy-0.2 dev-libs/fribidi dev-python/pygame[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-exec-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/glew media-libs/libpng:0 media-libs/libsdl[X,video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/pkgconfig >=sys-apps/sed-4 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Visual novel engine written in python
+EAPI=5
+HOMEPAGE=http://www.renpy.org
+IUSE=development doc examples python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-admin/eselect-renpy-0.2 dev-libs/fribidi dev-python/pygame[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-exec-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/glew media-libs/libpng:0 media-libs/libsdl[X,video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=examples? ( development )
+SLOT=6.15
+SRC_URI=http://www.renpy.org/dl/6.15.0/renpy-6.15.0-source.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 distutils-r1 c43389ef760cd7e42d7bf53666cfa6e0 eutils 2824df7f5dc9f47aee293af8a6b517ed games e0a83e3f3f024b8c8ef7a8217d716cbf gnome2-utils 794d2847b4af390a1e020924876c8297 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 8a2f7fb683287f1c6a95198ff0fb21e5 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=4b28921c31d35cb9c81a9d02b9ce23e9
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
new file mode 100644
index 000000000000..c617fa4fd3de
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DESCRIPTION=Updated clone of Westood Studios' Dune2
+EAPI=5
+HOMEPAGE=http://dunelegacy.sourceforge.net
+IUSE=+alsa pulseaudio
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis]
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 2824df7f5dc9f47aee293af8a6b517ed games e0a83e3f3f024b8c8ef7a8217d716cbf gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=14e94026aaf56c5538e3076ceba1ac6a
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r1 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r1
new file mode 100644
index 000000000000..b0d0faf092b9
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=KDE thumbnail-plugin that generates thumbnails for ODF files
+EAPI=5
+HOMEPAGE=http://www.kde-apps.org/content/show.php?content=110864
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c5f8f1de9b18259c59c9dc30494d72c5
diff --git a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r3 b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r3
index feb3d91b565f..b537621587a6 100644
--- a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r3
+++ b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r3
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
DESCRIPTION=Meta ebuild for LXDE, the Lightweight X11 Desktop Environment
EAPI=2
HOMEPAGE=http://lxde.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~x86
LICENSE=metapackage
RDEPEND=>=lxde-base/menu-cache-0.3.3 =lxde-base/lxappearance-0.5* =lxde-base/lxde-icon-theme-0.5* =lxde-base/lxde-common-0.5.5* =lxde-base/lxmenu-data-0.1* =lxde-base/lxinput-0.3* >=lxde-base/lxpanel-0.5.10 =lxde-base/lxrandr-0.1* >=lxde-base/lxsession-0.4.6.1 =lxde-base/lxsession-edit-0.2* =lxde-base/lxshortcut-0.1* =lxde-base/lxtask-0.1* =lxde-base/lxterminal-0.1.11* media-gfx/gpicview x11-misc/pcmanfm x11-wm/openbox >=x11-misc/obconf-2.0.3_p20111019
SLOT=0
-_md5_=9c830ff19cad9c9ac219bd9e64eac236
+_md5_=f6a3b66f768cf3ccd0bbadbd317edab9
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.5.12 b/metadata/md5-cache/lxde-base/lxpanel-0.5.12
index 60ce61e3fe85..b78a644342da 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.5.12
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.5.12
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight X11 desktop panel for LXDE
EAPI=4
HOMEPAGE=http://lxde.org/
IUSE=+alsa wifi
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%200.5.12/lxpanel-0.5.12.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9cc4c12977538e64a4a44316eac1d40c
+_md5_=3d866210455602795148a4c6d8e4a1a7
diff --git a/metadata/md5-cache/media-gfx/arss-0.2.3 b/metadata/md5-cache/media-gfx/arss-0.2.3
index 0e9ff12af4e8..462954d1f995 100644
--- a/metadata/md5-cache/media-gfx/arss-0.2.3
+++ b/metadata/md5-cache/media-gfx/arss-0.2.3
@@ -1,6 +1,7 @@
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=sci-libs/fftw sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=Analysis & Resynthesis Sound Spectrograph
+EAPI=5
HOMEPAGE=http://arss.sourceforge.net
KEYWORDS=~amd64
LICENSE=GPL-2
@@ -8,4 +9,4 @@ RDEPEND=sci-libs/fftw
SLOT=0
SRC_URI=mirror://sourceforge/arss/arss-0.2.3-src.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2d47fe84fb823e6eeb4c3f3f3f907b01
+_md5_=cd6c865b05ebc323fe9f3d1870bb82e9
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.0 b/metadata/md5-cache/media-libs/libmetalink-0.1.0
index 1e1569f7dcf6..8cbd01c0cf78 100644
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.0
+++ b/metadata/md5-cache/media-libs/libmetalink-0.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling Metalink files
EAPI=2
HOMEPAGE=http://launchpad.net/libmetalink
IUSE=expat test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ppc ~ppc64 ~x86
LICENSE=MIT
RDEPEND=expat? ( dev-libs/expat ) !expat? ( >=dev-libs/libxml2-2.6.24 )
SLOT=0
SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.0/+download/libmetalink-0.1.0.tar.bz2
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be0d1a53546ff4aeaf269f3c17774ffa
+_md5_=ddff02c02287f2eb67b6a212b821c6ff
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.6.2 b/metadata/md5-cache/media-libs/phonon-vlc-0.6.2
new file mode 100644
index 000000000000..0fb19c7e3eca
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=media-libs/phonon-4.6.0 >=media-video/vlc-2.0.1[dbus,ogg,vorbis] >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtdbus-4.6.0:4 >=dev-qt/qtgui-4.6.0:4 app-arch/xz-utils >=dev-util/automoc-0.9.87 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Phonon VLC backend
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=>=media-libs/phonon-4.6.0 >=media-video/vlc-2.0.1[dbus,ogg,vorbis] >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtdbus-4.6.0:4 >=dev-qt/qtgui-4.6.0:4
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.6.2/phonon-backend-vlc-0.6.2.tar.xz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2d15755f2019d3b5aa6e94b3ca0801c3
diff --git a/metadata/md5-cache/media-sound/scmpc-0.3.1 b/metadata/md5-cache/media-sound/scmpc-0.3.1
deleted file mode 100644
index e08a16cb792c..000000000000
--- a/metadata/md5-cache/media-sound/scmpc-0.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/glib:2 dev-libs/confuse net-misc/curl virtual/pkgconfig
-DESCRIPTION=a client for MPD which submits your tracks to last.fm
-EAPI=4
-HOMEPAGE=http://cmende.github.com/scmpc/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/confuse net-misc/curl
-SLOT=0
-SRC_URI=mirror://github/cmende/scmpc/scmpc-0.3.1.tar.bz2
-_md5_=be3a3e7333bbb2befa4c163e31d371fb
diff --git a/metadata/md5-cache/media-sound/scmpc-0.4.1 b/metadata/md5-cache/media-sound/scmpc-0.4.1
new file mode 100644
index 000000000000..e0a3e6980076
--- /dev/null
+++ b/metadata/md5-cache/media-sound/scmpc-0.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-libs/glib:2 dev-libs/confuse media-libs/libmpdclient net-misc/curl virtual/pkgconfig
+DESCRIPTION=a client for MPD which submits your tracks to last.fm
+EAPI=4
+HOMEPAGE=http://cmende.github.com/scmpc/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/confuse media-libs/libmpdclient net-misc/curl
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~angelos/scmpc-0.4.1.tar.bz2
+_md5_=80e4465d9c6e2f36663c2e2ddd06f586
diff --git a/metadata/md5-cache/media-sound/sox-14.4.1 b/metadata/md5-cache/media-sound/sox-14.4.1
index ac023288f361..00eda86fd105 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.1
+++ b/metadata/md5-cache/media-sound/sox-14.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=The swiss army knife of sound processing programs
EAPI=4
HOMEPAGE=http://sox.sourceforge.net
IUSE=alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs twolame wavpack
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=>=sys-devel/libtool-2.2.6b >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) ffmpeg? ( >=virtual/ffmpeg-0.9 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libvorbis media-libs/libogg ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
SLOT=0
SRC_URI=mirror://sourceforge/sox/sox-14.4.1.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5c65cef2ebb3ae2c51329eeabd5b4dc
+_md5_=d2865970bebbc713c5638334657e8e54
diff --git a/metadata/md5-cache/media-video/avidemux-2.6.1 b/metadata/md5-cache/media-video/avidemux-2.6.1
index 06089c0160c7..ce49a1920263 100644
--- a/metadata/md5-cache/media-video/avidemux-2.6.1
+++ b/metadata/md5-cache/media-video/avidemux-2.6.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/libiconv dev-libs/libxml2 media-libs/libpng >=dev-lang/spidermonkey-1.5-r2 gtk? ( >=x11-libs/gtk+-2.6.0:2 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) x264? ( media-libs/x264 ) xvid? ( media-libs/xvid ) aften? ( media-libs/aften ) amr? ( media-libs/opencore-amr ) lame? ( media-sound/lame ) dts? ( media-libs/libdca ) vorbis? ( media-libs/libvorbis ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) truetype? ( >=media-libs/freetype-2.1.5 ) fontconfig? ( media-libs/fontconfig ) sdl? ( media-libs/libsdl ) xv? ( x11-libs/libXv ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender oss? ( virtual/os-headers ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-lang/spidermonkey-1.5-r2 dev-libs/libxml2 media-libs/libpng x11-libs/libX11 x11-libs/libXext x11-libs/libXrender virtual/libiconv aften? ( media-libs/aften ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) amr? ( media-libs/opencore-amr ) dts? ( media-libs/libdca ) fontconfig? ( media-libs/fontconfig ) gtk? ( >=x11-libs/gtk+-2.6.0:2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) sdl? ( media-libs/libsdl ) truetype? ( >=media-libs/freetype-2.1.5 ) x264? ( media-libs/x264 ) xv? ( x11-libs/libXv ) xvid? ( media-libs/xvid ) vorbis? ( media-libs/libvorbis ) oss? ( virtual/os-headers ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
-EAPI=4
+EAPI=5
HOMEPAGE=http://fixounet.free.fr/avidemux
IUSE=aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264 linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_ja linguas_pt_BR linguas_ru linguas_sr linguas_sr@latin linguas_tr
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MIT GPL-1 public-domain PSF-2
-RDEPEND=virtual/libiconv dev-libs/libxml2 media-libs/libpng >=dev-lang/spidermonkey-1.5-r2 gtk? ( >=x11-libs/gtk+-2.6.0:2 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) x264? ( media-libs/x264 ) xvid? ( media-libs/xvid ) aften? ( media-libs/aften ) amr? ( media-libs/opencore-amr ) lame? ( media-sound/lame ) dts? ( media-libs/libdca ) vorbis? ( media-libs/libvorbis ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) truetype? ( >=media-libs/freetype-2.1.5 ) fontconfig? ( media-libs/fontconfig ) sdl? ( media-libs/libsdl ) xv? ( x11-libs/libXv ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
+LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
+RDEPEND=>=dev-lang/spidermonkey-1.5-r2 dev-libs/libxml2 media-libs/libpng x11-libs/libX11 x11-libs/libXext x11-libs/libXrender virtual/libiconv aften? ( media-libs/aften ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) amr? ( media-libs/opencore-amr ) dts? ( media-libs/libdca ) fontconfig? ( media-libs/fontconfig ) gtk? ( >=x11-libs/gtk+-2.6.0:2 ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) sdl? ( media-libs/libsdl ) truetype? ( >=media-libs/freetype-2.1.5 ) x264? ( media-libs/x264 ) xv? ( x11-libs/libXv ) xvid? ( media-libs/xvid ) vorbis? ( media-libs/libvorbis )
SLOT=2.6
SRC_URI=mirror://sourceforge/avidemux/2.6.1/avidemux_2.6.1.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de l10n 33bde4fb0cfd3a21a277b66bfd837e19 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=51d0c1d22e64d37a6f3b72504a7ba851
+_md5_=ab75be1108a18b7f66843ae985496ad2
diff --git a/metadata/md5-cache/media-video/ffmpeg-1.0.4 b/metadata/md5-cache/media-video/ffmpeg-1.0.5
similarity index 98%
rename from metadata/md5-cache/media-video/ffmpeg-1.0.4
rename to metadata/md5-cache/media-video/ffmpeg-1.0.5
index 356776c05087..799512edd1fe 100644
--- a/metadata/md5-cache/media-video/ffmpeg-1.0.4
+++ b/metadata/md5-cache/media-video/ffmpeg-1.0.5
@@ -9,6 +9,6 @@ LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
SLOT=0
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.0.4.tar.bz2
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.0.5.tar.bz2
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f94d0ca3af2283aaf1b15a885f943f24
+_md5_=6b36543a49b55cd4cf91f5fab51cfd10
diff --git a/metadata/md5-cache/media-video/ffmpeg-1.1.2 b/metadata/md5-cache/media-video/ffmpeg-1.1.2
deleted file mode 100644
index 6338ffe65abb..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
-EAPI=4
-HOMEPAGE=http://ffmpeg.org/
-IUSE=aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
-REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
-SLOT=0
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.1.2.tar.bz2
-_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1b5276a1a2ffde0929f74e4a97975569
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index be4e4c56bde5..f794c8583c37 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
EAPI=4
HOMEPAGE=http://ffmpeg.org/
-IUSE=aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
+IUSE=aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
+RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
SLOT=0
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5307f0f32b8fe9e94fe223afe1afd404
+_md5_=381ce3136040c586d1f400518c7416bb
diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.4 b/metadata/md5-cache/net-irc/hexchat-2.9.4
index c210de4a11c1..459d013a9e31 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.9.4
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical IRC client based on XChat
EAPI=5
HOMEPAGE=http://www.hexchat.org/
IUSE=dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins python spell ssl threads debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/pango dbus? ( >=dev-libs/dbus-glib-0.98 ) gtk? ( x11-libs/gtk+:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) spell? ( dev-libs/libxml2 ) libproxy? ( net-libs/libproxy ) ssl? ( >=dev-libs/openssl-0.9.8u )
SLOT=0
SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.4.tar.xz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 96ca31031ada9967bcf96a4fd8977ae4 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=6dddefa8c90e6c54c4694fa562a36597
+_md5_=c68866023553a2b1d6719a3ce52be9e0
diff --git a/metadata/md5-cache/net-libs/gnutls-2.12.23 b/metadata/md5-cache/net-libs/gnutls-2.12.23
index 23dece817ffe..54c30fc9f119 100644
--- a/metadata/md5-cache/net-libs/gnutls-2.12.23
+++ b/metadata/md5-cache/net-libs/gnutls-2.12.23
@@ -4,10 +4,10 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
EAPI=4
HOMEPAGE=http://www.gnutls.org/
IUSE=bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-2.1
RDEPEND=>=dev-libs/libtasn1-0.3.4 =dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
SLOT=0
SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-2.12.23.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=aafa90da84c01f756aed157fe112907a
+_md5_=3f28b70efa23f34dcf8f1d086d10adeb
diff --git a/metadata/md5-cache/net-misc/curl-7.29.0-r1 b/metadata/md5-cache/net-misc/curl-7.29.0-r1
index a90326267511..337f921a81f5 100644
--- a/metadata/md5-cache/net-misc/curl-7.29.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.29.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
EAPI=4
HOMEPAGE=http://curl.haxx.se/
IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.29.0.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=36f9ff37c022d0fdab24faa21b40a9ff
+_md5_=4c536b5ad03fc65620278023b2e50160
diff --git a/metadata/md5-cache/net-misc/guidedog-1.1-r1 b/metadata/md5-cache/net-misc/guidedog-1.1-r1
new file mode 100644
index 000000000000..a945fe850edf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/guidedog-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/pykde4-4.4:4[aqua=,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A network/routing configuration utility for KDE 4
+EAPI=5
+HOMEPAGE=http://www.simonzone.com/software/guidedog/
+IUSE=debug python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 aqua
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/pykde4-4.4:4[aqua=,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] net-firewall/iptables >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://www.simonzone.com/software/guidedog/guidedog-1.1.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=161fe28685935d50af2367c54d6e3050
diff --git a/metadata/md5-cache/net-misc/openntpd-20080406 b/metadata/md5-cache/net-misc/openntpd-20080406
index b470eafd6437..f6a40e03fcbc 100644
--- a/metadata/md5-cache/net-misc/openntpd-20080406
+++ b/metadata/md5-cache/net-misc/openntpd-20080406
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
EAPI=5
HOMEPAGE=http://www.openntpd.org/
IUSE=ssl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
LICENSE=BSD GPL-2
RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
SLOT=0
SRC_URI=mirror://debian/pool/main/o/openntpd/openntpd_20080406p.orig.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_20080406p-4.debian.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf87148a7e9822914fc747dab02ce105
+_md5_=d196a5ac009c4757680232e3413ba822
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.01.13 b/metadata/md5-cache/net-misc/youtube-dl-2013.01.13
index 087180d3c2eb..1f71c1fcd580 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.01.13
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.01.13
@@ -1,6 +1,6 @@
DEFINED_PHASES=install prepare setup
DEPEND=test? ( dev-python/nose[coverage(+)] )
-DESCRIPTION=A small command-line program to download videos from YouTube.
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
EAPI=5
HOMEPAGE=http://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
@@ -9,4 +9,4 @@ LICENSE=public-domain
SLOT=0
SRC_URI=http://youtube-dl.org/downloads/2013.01.13/youtube-dl-2013.01.13.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6fe20f48d8552f6e0d400568879f9573
+_md5_=96679052451bd9599a3dd24bc99a50a6
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.01.28 b/metadata/md5-cache/net-misc/youtube-dl-2013.01.28
index 14d2ee9224c5..7a5ce0086e9a 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.01.28
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.01.28
@@ -1,6 +1,6 @@
DEFINED_PHASES=install prepare setup
DEPEND=test? ( dev-python/nose[coverage(+)] )
-DESCRIPTION=A small command-line program to download videos from YouTube.
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
EAPI=5
HOMEPAGE=http://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
@@ -9,4 +9,4 @@ LICENSE=public-domain
SLOT=0
SRC_URI=http://youtube-dl.org/downloads/2013.01.28/youtube-dl-2013.01.28.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f5bcf3052900dd5029b3112280d07b38
+_md5_=840895f147e6e54dbf007f5db10bfa74
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.02.02 b/metadata/md5-cache/net-misc/youtube-dl-2013.02.02
index 752e08ed65b1..c7eabcafad15 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.02.02
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.02.02
@@ -1,6 +1,6 @@
DEFINED_PHASES=install prepare setup
DEPEND=test? ( dev-python/nose[coverage(+)] )
-DESCRIPTION=A small command-line program to download videos from YouTube.
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
EAPI=5
HOMEPAGE=http://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
@@ -9,4 +9,4 @@ LICENSE=public-domain
SLOT=0
SRC_URI=http://youtube-dl.org/downloads/2013.02.02/youtube-dl-2013.02.02.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0786fe212690b0c5554b75639bfc7d9
+_md5_=28ef913ce9f662fcde62562dd82345b5
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.02.25 b/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
index 81b9d4ffaf0a..243e89f5ebff 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
@@ -1,6 +1,6 @@
DEFINED_PHASES=install prepare setup
DEPEND=test? ( dev-python/nose[coverage(+)] )
-DESCRIPTION=A small command-line program to download videos from YouTube.
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
EAPI=5
HOMEPAGE=http://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
@@ -9,4 +9,4 @@ LICENSE=public-domain
SLOT=0
SRC_URI=http://youtube-dl.org/downloads/2013.02.25/youtube-dl-2013.02.25.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d69de00b1e67b447af6b2117cf71c48c
+_md5_=3da3a0d8152caa5e4ef96f2791ce2fef
diff --git a/metadata/md5-cache/net-p2p/kmldonkey-2.0.7 b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
new file mode 100644
index 000000000000..34594fd2f06b
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=plasma? ( >=kde-base/plasma-workspace-4.4:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Provides integration for the MLDonkey P2P software and KDE 4.
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug plasma aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=plasma? ( >=kde-base/plasma-workspace-4.4:4[aqua=] ) net-p2p/mldonkey >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=https://api.opensuse.org/public/source/home:eduardhc/kmldonkey-kde4/kmldonkey-2.0.7.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=e578641959c7c36baacb2c606485e675
diff --git a/metadata/md5-cache/net-proxy/dansguardian-2.10.1.1-r2 b/metadata/md5-cache/net-proxy/dansguardian-2.10.1.1-r2
index c930bc94e32e..2380323d7525 100644
--- a/metadata/md5-cache/net-proxy/dansguardian-2.10.1.1-r2
+++ b/metadata/md5-cache/net-proxy/dansguardian-2.10.1.1-r2
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib pcre? ( dev-libs/libpcre ) clamav? ( >=app-antivirus/clama
SLOT=0
SRC_URI=http://dansguardian.org/downloads/2/Stable/dansguardian-2.10.1.1.tar.gz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d0d5426809c123157c1b92cbba99ae9
+_md5_=177b690d8a7ddde6f9e58cd2f1748441
diff --git a/metadata/md5-cache/net-proxy/dansguardian-2.12.0.3 b/metadata/md5-cache/net-proxy/dansguardian-2.12.0.3
new file mode 100644
index 000000000000..2a2d7040f598
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/dansguardian-2.12.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=sys-libs/zlib clamav? ( app-antivirus/clamav ) logrotate? ( app-admin/logrotate ) ntlm? ( virtual/libiconv ) pcre? ( dev-libs/libpcre ) virtual/pkgconfig
+DESCRIPTION=Web content filtering via proxy
+EAPI=5
+HOMEPAGE=http://www.dansguardian.org
+IUSE=avast backtrace clamav commandline debug email +fancydm icap kaspersky +lfs logrotate ntlm orig-ip +pcre static-libs trickledm
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib clamav? ( app-antivirus/clamav ) logrotate? ( app-admin/logrotate ) ntlm? ( virtual/libiconv ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=mirror://sourceforge/dansguardian/dansguardian-2.12.0.3.tar.bz2
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bcbc3cbc1bb3e9f040227e64a14b1e05
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.0_pre1 b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1
new file mode 100644
index 000000000000..7b64d4e54d76
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/dante-1.4.0_pre1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A free socks4,5 and msproxy implementation
+EAPI=5
+HOMEPAGE=http://www.inet.no/dante/
+IUSE=debug kerberos pam selinux static-libs tcpd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
+SLOT=0
+SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.0-pre1.tar.gz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0b34bfe0176156236e1cdd2ccfdd40b0
diff --git a/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1 b/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
index 67c73e75f5bc..acd28fbedb4b 100644
--- a/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
+++ b/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The dnsproxy daemon is a proxy for DNS queries
EAPI=4
HOMEPAGE=http://www.wolfermann.org/dnsproxy.html
KEYWORDS=amd64 x86
-LICENSE=MIT
+LICENSE=MIT GPL-2
RDEPEND=dev-libs/libevent
SLOT=0
SRC_URI=http://www.wolfermann.org/dnsproxy-1.16.tar.gz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2fc767652558ac0e18c8192a74ff1f2
+_md5_=8f3a6a7ee6adee1bf5b846de96fc4c12
diff --git a/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2 b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2
new file mode 100644
index 000000000000..13ca4fdce132
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup
+DEPEND==dev-lang/python-2.7*
+DESCRIPTION=Proxy cache for Gentoo packages
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/http-replicator
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND==dev-lang/python-2.7*
+SLOT=0
+SRC_URI=mirror://sourceforge/http-replicator/http-replicator_4.0alpha2.tgz
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b python 89dff4d72d57f253f9f78b7f8c5d55c8 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=19a1df0c5754355cd02af88654fe57cc
diff --git a/metadata/md5-cache/net-proxy/nylon-1.21 b/metadata/md5-cache/net-proxy/nylon-1.21
index fdc26709a727..e13c5101ff04 100644
--- a/metadata/md5-cache/net-proxy/nylon-1.21
+++ b/metadata/md5-cache/net-proxy/nylon-1.21
@@ -3,8 +3,8 @@ DEPEND=>=dev-libs/libevent-0.6
DESCRIPTION=A lightweight SOCKS proxy server
HOMEPAGE=http://monkey.org/~marius/nylon/
KEYWORDS=amd64 ppc ~ppc64 sparc x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=>=dev-libs/libevent-0.6
SLOT=0
SRC_URI=http://monkey.org/~marius/nylon/nylon-1.21.tar.gz
-_md5_=b689fdcb05e0b211beac2632a196da69
+_md5_=343247adcb1f250423e5de6d2c8229de
diff --git a/metadata/md5-cache/net-proxy/nylon-1.21-r1 b/metadata/md5-cache/net-proxy/nylon-1.21-r1
index d6867f708f4a..79a0a0f84c6a 100644
--- a/metadata/md5-cache/net-proxy/nylon-1.21-r1
+++ b/metadata/md5-cache/net-proxy/nylon-1.21-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A lightweight SOCKS proxy server
EAPI=4
HOMEPAGE=http://monkey.org/~marius/nylon/
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=>=dev-libs/libevent-0.6
SLOT=0
SRC_URI=http://monkey.org/~marius/nylon/nylon-1.21.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5984a067a8df8dea221cb60a06298102
+_md5_=7c4b7f21414aa0ba278e9ab86e82b1bd
diff --git a/metadata/md5-cache/net-proxy/polipo-1.0.4.1-r1 b/metadata/md5-cache/net-proxy/polipo-1.0.4.1-r1
index b038d3e1647f..641a3ce1532a 100644
--- a/metadata/md5-cache/net-proxy/polipo-1.0.4.1-r1
+++ b/metadata/md5-cache/net-proxy/polipo-1.0.4.1-r1
@@ -1,11 +1,12 @@
DEFINED_PHASES=compile install postinst setup
DEPEND=sys-apps/texinfo
DESCRIPTION=A caching web proxy
+EAPI=4
HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/polipo/
KEYWORDS=amd64 x86
-LICENSE=MIT
+LICENSE=MIT GPL-2
RDEPEND=sys-apps/texinfo
SLOT=0
SRC_URI=http://freehaven.net/~chrisd/polipo/polipo-1.0.4.1.tar.gz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a4f0959899219f1def3c5936195d7a55
+_md5_=c5308122494f1ae42380921f35ff9be8
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.23 b/metadata/md5-cache/net-proxy/squid-3.1.23
index ea99a9a31a01..f09d74599d87 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.23
+++ b/metadata/md5-cache/net-proxy/squid-3.1.23
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
EAPI=4
HOMEPAGE=http://www.squid-cache.org/
IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client mysql postgres sqlite zero-penalty-hit pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux +epoll tproxy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
REQUIRED_USE=tproxy? ( caps )
SLOT=0
SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.23.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=a1eb3ca87832155f154756445c35e14e
+_md5_=3b8ed14e62471de3c4ce51193e20e7cf
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.4.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.4.0
index 5dace65eef36..7a82dae85341 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.4.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( gflags )
SLOT=0
SRC_URI=https://ceres-solver.googlecode.com/files/ceres-solver-1.4.0.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3654f4f1f28c30fda16415860ff3c72b
+_md5_=88e792641f471df72f283f51f2a79e2e
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.3-r2 b/metadata/md5-cache/sci-libs/nlopt-2.3-r2
index 7f4bc3880cd6..681bc382820c 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.3-r2
+++ b/metadata/md5-cache/sci-libs/nlopt-2.3-r2
@@ -10,4 +10,4 @@ RDEPEND=guile? ( dev-scheme/guile ) octave? ( sci-mathematics/octave ) python? (
SLOT=0
SRC_URI=http://ab-initio.mit.edu/nlopt//nlopt-2.3.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils c3608254689d959486b175186734d10d eutils 2824df7f5dc9f47aee293af8a6b517ed libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 89dff4d72d57f253f9f78b7f8c5d55c8 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8bc7f86c4012ba5aa86144b2d42b0abd
+_md5_=ad7f7451fdf21feff2f8ff4d6e345a9a
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.1-r1
index 5f2adcb5780e..55ac63d15f28 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-4.6.1-r1
@@ -10,4 +10,4 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) !emacs
SLOT=0
SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.1.tar.gz
_eclasses_=elisp-common 21605c8f0b2a5ffa3233faeb3f9df309 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b readme.gentoo 43b24e211d1b518039afb4f56cddd648 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 wxwidgets fb1a306837717dfa2af841ecdf929565
-_md5_=4923c72600d8a056715e98e5fc7bd613
+_md5_=5a926aecd97c2c0023b1a5caefa3df6a
diff --git a/metadata/md5-cache/sys-boot/lilo-23.2-r2 b/metadata/md5-cache/sys-boot/lilo-23.2-r2
index 13c9ea518b92..18f27b7b0b34 100644
--- a/metadata/md5-cache/sys-boot/lilo-23.2-r2
+++ b/metadata/md5-cache/sys-boot/lilo-23.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Standard Linux boot loader
EAPI=2
HOMEPAGE=https://alioth.debian.org/projects/lilo/
IUSE=static minimal pxeserial device-mapper
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
LICENSE=BSD GPL-2
RDEPEND=device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )
SLOT=0
SRC_URI=http://lilo.alioth.debian.org/ftp/sources/lilo-23.2.tar.gz mirror://gentoo/dolilo-0.5.tar.bz2
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa8afaf0f0dec7698c19cac3ccde6f40
+_md5_=4dd59f32cc3049f59a737b527e5a46a7
diff --git a/metadata/md5-cache/sys-devel/dwz-0.9 b/metadata/md5-cache/sys-devel/dwz-0.9
new file mode 100644
index 000000000000..c1abeaf10caf
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/dwz-0.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/elfutils
+DESCRIPTION=DWARF optimization and duplicate removal tool
+EAPI=5
+HOMEPAGE=http://sourceware.org/git/?p=dwz.git;a=summary
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=dev-libs/elfutils
+SLOT=0
+SRC_URI=mirror://gentoo/dwz-0.9.tar.xz
+_md5_=30a661a89f35705b4c80d60e729f9a5e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.35 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.35
new file mode 100644
index 000000000000..0d1e8b4a41d9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.35
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.4 kernel tree
+EAPI=3
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.35
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-17.base.tar.bz2 mirror://gentoo/genpatches-3.4-17.extras.tar.bz2
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed kernel-2 dd451098928ff900df7c254820871c00 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=3fa827bf302f1ae30f7f99fb18b5902a
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.4.33_p47 b/metadata/md5-cache/sys-kernel/rt-sources-3.4.33_p47
new file mode 100644
index 000000000000..2ffab339a6d4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.4.33_p47
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full Linux 3.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=2
+HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.33_p47
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.33.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://kernel/linux/kernel/projects/rt/3.4/patch-3.4.33-rt47.patch.bz2
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed kernel-2 dd451098928ff900df7c254820871c00 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=1550f7c0543ac75b46fc7e3833a4362b
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.68
similarity index 63%
rename from metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.0.68
index 557cf4104790..1a5071df7bb5 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.68
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Real-time patchset for the Linux Kernel
+DESCRIPTION=Full sources for the Linux kernel
EAPI=2
-HOMEPAGE=http://www.kernel.org/pub/linux/kernel/projects/rt/
+HOMEPAGE=http://www.kernel.org
IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 !deblob? ( freedist )
PDEPEND=!build? ( virtual/dev-manager )
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
RESTRICT=binchecks strip
-SLOT=3.0.14_p31
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.14.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 ) mirror://kernel/linux/kernel/projects/rt/3.0/patch-3.0.14-rt31.patch.gz
+SLOT=3.0.68
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.68.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 )
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed kernel-2 dd451098928ff900df7c254820871c00 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e75e9a1c9ce70706235de5a8257d5852
+_md5_=17af7ca4c35925b22af97bb543861419
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.35 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.35
new file mode 100644
index 000000000000..d9ebbd241b6c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.35
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=2
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.35
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.35.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed kernel-2 dd451098928ff900df7c254820871c00 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=eb5123fa51b3d2d84afd874005874b58
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.2
new file mode 100644
index 000000000000..539d54c08649
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=2
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.8.2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.8.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 )
+_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed kernel-2 dd451098928ff900df7c254820871c00 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=4ea47cf2cea0b01225c5ab4e0fda4cba
diff --git a/metadata/md5-cache/www-client/rekonq-2.2 b/metadata/md5-cache/www-client/rekonq-2.2
index 8210bc1fbbe0..deeb3cdc1b2d 100644
--- a/metadata/md5-cache/www-client/rekonq-2.2
+++ b/metadata/md5-cache/www-client/rekonq-2.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] opera? ( app-crypt/qca:2 dev-libs/qoauth ) semantic-desktop? ( >=kde-base/nepomuk-core-4.4:4[aqua=] dev-libs/soprano ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DEPEND=>=kde-base/kdelibs-4.10:4[aqua=,semantic-desktop?] opera? ( app-crypt/qca:2 dev-libs/qoauth ) semantic-desktop? ( >=kde-base/nepomuk-core-4.10:4[aqua=] dev-libs/soprano ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.10:4[aqua=]
DESCRIPTION=A browser based on qtwebkit
EAPI=5
HOMEPAGE=http://rekonq.kde.org/
IUSE=debug opera semantic-desktop linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_ia linguas_it linguas_km linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
-RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] opera? ( app-crypt/qca:2 dev-libs/qoauth ) semantic-desktop? ( >=kde-base/nepomuk-core-4.4:4[aqua=] dev-libs/soprano ) >=kde-base/oxygen-icons-4.4:4[aqua=] 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_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) 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_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) 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_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) 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 >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+RDEPEND=>=kde-base/kdelibs-4.10:4[aqua=,semantic-desktop?] opera? ( app-crypt/qca:2 dev-libs/qoauth ) semantic-desktop? ( >=kde-base/nepomuk-core-4.10:4[aqua=] dev-libs/soprano ) >=kde-base/oxygen-icons-4.10:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_km(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.10:4[aqua=]
SLOT=4
SRC_URI=mirror://sourceforge/rekonq/rekonq-2.2.tar.bz2
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 99e1013bc1a5444b994d9a4b8c69b4f1 kde4-functions d582c981f237aef7193dcba509e5d8d4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=93dd9027f404e94222b00d22d2d25b2f
+_md5_=7c7f5e9ab3ca534c2ca3ee7c727252aa
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.7.1 b/metadata/md5-cache/www-plugins/lightspark-0.7.1
new file mode 100644
index 000000000000..fe8f76dff1f5
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/lightspark-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts media-libs/libpng media-libs/libsdl >=sys-devel/gcc-4.6.0[cxx] >=sys-devel/llvm-3 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) !gles? ( >=media-libs/glew-1.5.3 virtual/opengl ) gles? ( media-libs/mesa[gles2] ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) virtual/jpeg amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=High performance flash player
+EAPI=4
+HOMEPAGE=http://lightspark.sourceforge.net/
+IUSE=curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts media-libs/libpng media-libs/libsdl >=sys-devel/gcc-4.6.0[cxx] >=sys-devel/llvm-3 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) !gles? ( >=media-libs/glew-1.5.3 virtual/opengl ) gles? ( media-libs/mesa[gles2] ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) virtual/jpeg
+SLOT=0
+SRC_URI=http://launchpad.net/lightspark/trunk/lightspark-0.7.1/+download/lightspark-0.7.1.tar.gz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b nsplugins b195a1306f4ee7cf507037dc6aa5ba89 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f2af67c00a94520400e2a4ff0de9f143
diff --git a/metadata/md5-cache/www-servers/apache-2.4.4 b/metadata/md5-cache/www-servers/apache-2.4.4
index 3846826ee8e3..e1e16af86c44 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.4
+++ b/metadata/md5-cache/www-servers/apache-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=The Apache Web Server.
EAPI=2
HOMEPAGE=http://httpd.apache.org/
IUSE=ssl debug doc ldap selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=Apache-2.0 Apache-1.1
PDEPEND=~app-admin/apache-tools-2.4.4
RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
SLOT=2
SRC_URI=mirror://apache/httpd/httpd-2.4.4.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.4.4-20130227.tar.bz2
_eclasses_=apache-2 487f2187a5cf187b49db334b82d57422 autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 ssl-cert 0b45da48a22fda62c57c1809b8b55315 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=243b101cbb0e94b462344f085752406d
+_md5_=16966268094605e054674a5aa16d5bb2
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.8 b/metadata/md5-cache/www-servers/uwsgi-1.4.8
new file mode 100644
index 000000000000..d3b56a3da916
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=5
+HOMEPAGE=http://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.4.8[php_targets_php5-3] =www-servers/uwsgi-1.4.8[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
+SLOT=0
+SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.8.tar.gz
+_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools cf83655b19ed98f9ea3b44f4572b51a3 depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de java-utils-2 dcda71e114d638cdf01db57b8445337d libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 python 89dff4d72d57f253f9f78b7f8c5d55c8 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=c80d2559fec4eb665cbefc5ebfa64600
diff --git a/metadata/md5-cache/x11-libs/qwt-6.0.1 b/metadata/md5-cache/x11-libs/qwt-5.2.3
similarity index 74%
rename from metadata/md5-cache/x11-libs/qwt-6.0.1
rename to metadata/md5-cache/x11-libs/qwt-5.2.3
index fbf42b946974..a78cce55acd0 100644
--- a/metadata/md5-cache/x11-libs/qwt-6.0.1
+++ b/metadata/md5-cache/x11-libs/qwt-5.2.3
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=dev-qt/qtgui:4 doc? ( !=dev-python/pygtk-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-apps/xrandr python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
SLOT=0
-SRC_URI=http://christian.amsuess.com/tools/arandr/files/arandr-0.1.7.tar.gz
+SRC_URI=http://christian.amsuess.com/tools/arandr/files/arandr-0.1.7.1.tar.gz
_eclasses_=distutils-r1 c43389ef760cd7e42d7bf53666cfa6e0 eutils 2824df7f5dc9f47aee293af8a6b517ed multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 8a2f7fb683287f1c6a95198ff0fb21e5 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e4126754610dbe84268de34072fb2f46
+_md5_=67afb83bf95d5562a2388227edc583fd
diff --git a/metadata/md5-cache/x11-misc/xclip-0.12 b/metadata/md5-cache/x11-misc/xclip-0.12
index cc6b4e040938..6ea70467fe4b 100644
--- a/metadata/md5-cache/x11-misc/xclip-0.12
+++ b/metadata/md5-cache/x11-misc/xclip-0.12
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt
DESCRIPTION=Command-line utility to read data from standard in and place it in an X selection
HOMEPAGE=http://sourceforge.net/projects/xclip/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXmu
SLOT=0
SRC_URI=mirror://sourceforge/xclip/xclip-0.12.tar.gz
-_md5_=2785feddbb23c09afe9b69cd459cfe75
+_md5_=ecd3de67d6a5446847422a7b377e0eea
diff --git a/metadata/md5-cache/x11-terms/kterm-6.2.0-r5 b/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
index 5ba1353d9e49..7c684bc82a9b 100644
--- a/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
+++ b/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
@@ -10,4 +10,4 @@ RDEPEND=app-text/rman sys-libs/ncurses x11-libs/libXmu x11-libs/libXpm x11-libs/
SLOT=0
SRC_URI=ftp://ftp.x.org/contrib/applications/kterm-6.2.0.tar.gz http://www.asahi-net.or.jp/~hc3j-tkg/kterm/kterm-6.2.0-wpi.patch.gz http://www.st.rim.or.jp/~hanataka/kterm-6.2.0.ext02.patch.gz
_eclasses_=eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3043d95178986cb8bc24a55cc04999db
+_md5_=9f46926fc84f2b0dde7deb8219be100e
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.1.2 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.1.2
new file mode 100644
index 000000000000..27d447be65f5
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Official GTK+:3 port of KDE's Oxygen widget style
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango
+SLOT=3
+SRC_URI=mirror://kde/stable/oxygen-gtk3/1.1.2/src/oxygen-gtk3-1.1.2.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=afddf4212d3d7976e79722be972014e6
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.3.2.1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.3.2.1
new file mode 100644
index 000000000000..ae1e85cc73b1
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24.2:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Official GTK+:2 port of KDE's Oxygen widget style
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24.2:2 x11-libs/libX11 x11-libs/pango
+SLOT=2
+SRC_URI=mirror://kde/stable/oxygen-gtk2/1.3.2.1/src/oxygen-gtk2-1.3.2.1.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 2dda478e7e4206f6fb1aa72785cb5ef7 eutils 2824df7f5dc9f47aee293af8a6b517ed flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fdc5bf29bda7c992b4a85f5d2a1bb005
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2
new file mode 100644
index 000000000000..939fa03fe8c3
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A panel plug-in which adds classic eyes to your every step
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
+SLOT=0
+SRC_URI=mirror://xfce/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.2.tar.bz2
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 2824df7f5dc9f47aee293af8a6b517ed fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 xfconf ba58c6f43e7fdfc116752aa58b488d83
+_md5_=f0a51b984f0d48742df9e29333520123
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9ad3c79a96b0..5e699fff2755 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 04 Mar 2013 09:07:00 +0000
+Mon, 04 Mar 2013 19:06:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c5efb84e2bd8..ff12a6c94f14 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Mar 4 09:06:58 UTC 2013
+Mon Mar 4 19:06:57 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c9773790a420..079192562fa9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 04 Mar 2013 09:30:01 +0000
+Mon, 04 Mar 2013 19:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0978c2eefd36..28587dcbc03e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1362387901 Mon Mar 4 09:05:01 2013 UTC
+1362423901 Mon Mar 4 19:05:01 2013 UTC
diff --git a/net-irc/hexchat/hexchat-2.9.4.ebuild b/net-irc/hexchat/hexchat-2.9.4.ebuild
index 870404248a14..23fc6e772bb2 100644
--- a/net-irc/hexchat/hexchat-2.9.4.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.9 2013/03/03 18:01:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.10 2013/03/04 11:59:47 jer Exp $
EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.hexchat.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins python spell ssl threads"
RDEPEND="dev-libs/glib:2
diff --git a/net-libs/gnutls/gnutls-2.12.23.ebuild b/net-libs/gnutls/gnutls-2.12.23.ebuild
index 7cb55b940a3a..5f4c478631ea 100644
--- a/net-libs/gnutls/gnutls-2.12.23.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23.ebuild,v 1.1 2013/02/05 10:42:02 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23.ebuild,v 1.5 2013/03/04 18:16:00 ranger Exp $
EAPI=4
@@ -18,7 +18,7 @@ fi
# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
RDEPEND=">=dev-libs/libtasn1-0.3.4
diff --git a/net-misc/curl/curl-7.29.0-r1.ebuild b/net-misc/curl/curl-7.29.0-r1.ebuild
index 7880fb6d49bb..4712be3931d3 100644
--- a/net-misc/curl/curl-7.29.0-r1.ebuild
+++ b/net-misc/curl/curl-7.29.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.29.0-r1.ebuild,v 1.2 2013/02/21 17:33:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.29.0-r1.ebuild,v 1.3 2013/03/04 18:29:18 ranger Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
diff --git a/net-misc/guidedog/Manifest b/net-misc/guidedog/Manifest
index b4eb2e146cec..db7e8cd38150 100644
--- a/net-misc/guidedog/Manifest
+++ b/net-misc/guidedog/Manifest
@@ -1 +1 @@
-DIST guidedog-1.1.tar.bz2 108059 RMD160 da601b73d1eed81732ec5019a88928770c67acc6 SHA1 369453736bcb8fc3c94b5d5fd19d4fe841653702 SHA256 1ce34e72add7fcc75a1a4e743a6799e1a61d6bdbf52ad8f0d1bd8d9916a638ad
+DIST guidedog-1.1.tar.bz2 108059 SHA256 1ce34e72add7fcc75a1a4e743a6799e1a61d6bdbf52ad8f0d1bd8d9916a638ad SHA512 ae9820b59154311c216aec3f7b767539ea6d35ac712d9205142de29d9bb770ddc87fd8c3ae91b563556e0517ca50bfa0198191bd329f4af95beda3253510badf WHIRLPOOL 119b9b834ea0b0b703fbca229a9f1ff8a49ed7685a1991e6cf7a4d1490559b6990dd8c9cf7023e87a88bb7fb4fbabe448f1565b5c46a0b2d836e012f455a6948
diff --git a/net-misc/guidedog/guidedog-1.1-r1.ebuild b/net-misc/guidedog/guidedog-1.1-r1.ebuild
new file mode 100644
index 000000000000..8f493bf03c4d
--- /dev/null
+++ b/net-misc/guidedog/guidedog-1.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guidedog/guidedog-1.1-r1.ebuild,v 1.1 2013/03/04 18:32:03 kensington Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1 kde4-base
+
+DESCRIPTION="A network/routing configuration utility for KDE 4"
+HOMEPAGE="http://www.simonzone.com/software/guidedog/"
+SRC_URI="http://www.simonzone.com/software/guidedog/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/PyQt4[${PYTHON_USEDEP}]
+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+"
+RDEPEND="${DEPEND}
+ net-firewall/iptables
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde4-base_pkg_setup
+}
+
+src_prepare() {
+ sed -e 's/python2.5/python/' -i src/sealed.py || die
+ python_fix_shebang src
+
+ kde4-base_src_prepare
+}
+
+src_install() {
+ kde4-base_src_install
+ rm -f "${ED}"usr/share/apps/guidedog/*.pyc
+}
diff --git a/net-misc/openntpd/openntpd-20080406.ebuild b/net-misc/openntpd/openntpd-20080406.ebuild
index 3fd455ada193..4999646bc651 100644
--- a/net-misc/openntpd/openntpd-20080406.ebuild
+++ b/net-misc/openntpd/openntpd-20080406.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406.ebuild,v 1.1 2012/12/22 06:30:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406.ebuild,v 1.3 2013/03/04 15:53:43 ottxor Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="ssl selinux"
RDEPEND="ssl? ( dev-libs/openssl )
@@ -33,7 +33,7 @@ pkg_setup() {
# make sure user has correct HOME when flipping between
# the standard ntp pkg and this one
- usermod -d /var/lib/openntpd/chroot ntp
+ usermod -d /var/lib/openntpd/chroot ntp || die
}
src_prepare() {
diff --git a/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild b/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild
index cbbfbd91ade1..b7942d0bade4 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild,v 1.9 2013/02/16 17:22:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.01.13.ebuild,v 1.10 2013/03/04 11:23:25 jer Exp $
EAPI=5
PYTHON_COMPAT=(python{2_5,2_6,2_7})
inherit bash-completion-r1 eutils python-single-r1
-DESCRIPTION="A small command-line program to download videos from YouTube."
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
HOMEPAGE="http://rg3.github.com/youtube-dl/"
SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
diff --git a/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild b/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild
index 7d1a54e4010b..5afe1af6bcec 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild,v 1.2 2013/02/13 15:13:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.01.28.ebuild,v 1.3 2013/03/04 11:23:25 jer Exp $
EAPI=5
PYTHON_COMPAT=(python{2_5,2_6,2_7})
inherit bash-completion-r1 eutils python-single-r1
-DESCRIPTION="A small command-line program to download videos from YouTube."
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
HOMEPAGE="http://rg3.github.com/youtube-dl/"
SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
diff --git a/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild b/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild
index cefa40696326..76ec80850f94 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild,v 1.3 2013/02/17 23:27:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.02.ebuild,v 1.4 2013/03/04 11:23:25 jer Exp $
EAPI=5
PYTHON_COMPAT=(python{2_5,2_6,2_7})
inherit bash-completion-r1 eutils python-single-r1
-DESCRIPTION="A small command-line program to download videos from YouTube."
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
HOMEPAGE="http://rg3.github.com/youtube-dl/"
SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
diff --git a/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild b/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
index ee860eda85a8..dadb13d5ac82 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild,v 1.1 2013/03/03 23:48:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild,v 1.2 2013/03/04 11:23:25 jer Exp $
EAPI=5
PYTHON_COMPAT=(python{2_5,2_6,2_7})
inherit bash-completion-r1 eutils python-single-r1
-DESCRIPTION="A small command-line program to download videos from YouTube."
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
HOMEPAGE="http://rg3.github.com/youtube-dl/"
SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
diff --git a/net-p2p/kmldonkey/Manifest b/net-p2p/kmldonkey/Manifest
index 2d8b77c7e4a2..7d40e3b62d33 100644
--- a/net-p2p/kmldonkey/Manifest
+++ b/net-p2p/kmldonkey/Manifest
@@ -1 +1,2 @@
-DIST kmldonkey-2.0.2-kde4.4.0.tar.bz2 420422 RMD160 1cecbb3c0fc78ca4e345da8af9cb4bf430be5e54 SHA1 c5a6a47456c2aebe518b081bc94d40fbfbf6489d SHA256 dfa34e249036d27712e481d5626897f17ab339496a209feab9707fde110b603f
+DIST kmldonkey-2.0.2-kde4.4.0.tar.bz2 420422 SHA256 dfa34e249036d27712e481d5626897f17ab339496a209feab9707fde110b603f
+DIST kmldonkey-2.0.7.tar.bz2 204642 SHA256 49954b7bf7f883e31ea1999e0109f416c12d646d8f51f410190d2ae79cab76e1 SHA512 59435fc13739fae51eb6ee4c9cdbc1aaddc08251b29208e67671bc7dd9e92cacfefec62a8cab8d780c237eb126b529980d17d00ec80c2e954641b2f18c7b48d2 WHIRLPOOL 3fcaef4d4c8fdd250e959a76158a46554332f367f55b6d2a8e25060bfe075c277a8fd893279e0e3d936d0f48c1b828f9a09948fb4ba2464108bd3b7b37bd1638
diff --git a/net-p2p/kmldonkey/kmldonkey-2.0.7.ebuild b/net-p2p/kmldonkey/kmldonkey-2.0.7.ebuild
new file mode 100644
index 000000000000..105460029bed
--- /dev/null
+++ b/net-p2p/kmldonkey/kmldonkey-2.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-2.0.7.ebuild,v 1.1 2013/03/04 10:21:46 kensington Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Provides integration for the MLDonkey P2P software and KDE 4."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="https://api.opensuse.org/public/source/home:eduardhc/${PN}-kde4/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug plasma"
+
+DEPEND="plasma? ( $(add_kdebase_dep plasma-workspace) )"
+RDEPEND="${DEPEND}
+ net-p2p/mldonkey
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with plasma)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 417793882d4e..d4da3f5597b0 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,2 +1,3 @@
DIST dansguardian-2.10.0.3.tar.gz 512695 SHA256 419be86f472ad0a69a8a15857a646271ac9739d29bd836be9159f2d955e5b963
DIST dansguardian-2.10.1.1.tar.gz 516800 SHA256 c245d58cf37f79f8a8e50b684d62b797a9f6ce1bb775e140969002dff7e11f92
+DIST dansguardian-2.12.0.3.tar.bz2 577701 SHA256 c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 SHA512 37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b WHIRLPOOL 64f64161a3dbf48c122fbf341ac8a7b4892be2049d1ac05948e9aa8c4cb927efa6ce929404b60c43f67457268f3c432b0ff109fb333ffe8ab84bba0b528b52eb
diff --git a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
index bdd1b25cdb48..4a06acd79809 100644
--- a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild,v 1.1 2012/09/16 10:31:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild,v 1.2 2013/03/04 12:13:11 tomwij Exp $
EAPI="2"
diff --git a/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild
new file mode 100644
index 000000000000..5a064160694a
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild,v 1.1 2013/03/04 12:13:11 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://www.${PN}.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avast backtrace clamav commandline debug email +fancydm icap kaspersky +lfs logrotate ntlm orig-ip +pcre static-libs trickledm"
+
+RDEPEND="sys-libs/zlib
+ clamav? ( app-antivirus/clamav )
+ logrotate? ( app-admin/logrotate )
+ ntlm? ( virtual/libiconv )
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+WIKI="http://contentfilter.futuragts.com/wiki/doku.php"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+ econf \
+ $(use_enable avast avastd) \
+ $(use_enable backtrace segv-backtrace) \
+ $(use_enable clamav clamd) \
+ $(use_enable commandline) \
+ $(use_with debug dgdebug) \
+ $(use_enable email) \
+ $(use_enable fancydm) \
+ $(use_enable icap) \
+ $(use_enable kaspersky kavd) \
+ $(use_enable lfs) \
+ --with-logdir=/var/log/${PN} \
+ $(use_enable ntlm) \
+ $(use_enable orig-ip) \
+ $(use_enable pcre) \
+ --with-piddir=/var/run \
+ --with-proxygroup=${PN} \
+ --with-proxyuser=${PN} \
+ $(use_enable static-libs static-zlib) \
+ $(use_enable trickledm)
+}
+
+src_install() {
+ default
+
+ # Edit config files for virus scanners chosen based on USE flags.
+ if use avast; then
+ sed -r -i -e 's/^#( *contentscanner *=.*avastdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+ fi
+
+ if use clamav; then
+ sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/${PN}"
+ sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+ fi
+
+ if use commandline; then
+ sed -r -i -e 's/^#( *contentscanner *=.*commandlinescan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+ fi
+
+ if use icap; then
+ sed -r -i -e 's/^#( *contentscanner *=.*icapscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+ fi
+
+ if use kaspersky; then
+ sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+ fi
+
+ # Install Gentoo init script
+ newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+ # Install log rotation file.
+ if use logrotate; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+ else
+ exeinto /etc/cron.weekly
+ newexe data/scripts/logrotation ${PN}.cron
+ fi
+
+ keepdir /var/log/${PN}
+ fperms o-rwx /var/log/${PN}
+}
+
+pkg_postinst() {
+ local runas="${PN}:${PN}"
+
+ if [ -d "${ROOT}/var/log/${PN}" ] ; then
+ chown -R ${runas} "${ROOT}/var/log/${PN}"
+ chmod o-rwx "${ROOT}/var/log/${PN}"
+ fi
+
+ einfo "For assistance configuring ${PN}, visit the wiki at ${WIKI}"
+}
diff --git a/net-proxy/dansguardian/files/dansguardian.init b/net-proxy/dansguardian/files/dansguardian.init
index c7b2438b5c17..b243c2410df8 100644
--- a/net-proxy/dansguardian/files/dansguardian.init
+++ b/net-proxy/dansguardian/files/dansguardian.init
@@ -1,32 +1,32 @@
#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.2 2005/12/08 22:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.3 2013/03/04 12:13:11 tomwij Exp $
-opts="${opts} reload"
+extra_started_commands="reload"
depend() {
- need net
- use dns \
- squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
- #dansguardian could be used in conjuction with any of the above web proxies
+ need net
+ use dns \
+ squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
+ #dansguardian could be used in conjuction with any of the above web proxies
+ provide dansguardian
}
start() {
- ebegin "Starting DansGuardian"
- start-stop-daemon --start --quiet --pidfile /var/run/dansguardian.pid \
- --exec /usr/sbin/dansguardian
- eend $?
+ ebegin "Starting DansGuardian"
+ start-stop-daemon --start --background --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
+ eend $?
}
stop() {
- ebegin "Stopping DansGuardian"
- start-stop-daemon --stop --quiet --pidfile /var/run/dansguardian.pid
- eend $?
+ ebegin "Stopping DansGuardian"
+ start-stop-daemon --stop --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
+ eend $?
}
reload() {
- ebegin "Reloading DansGuardian"
- /usr/sbin/dansguardian -g
- eend $?
+ ebegin "Leaving current connections open. Reloading filter group config files."
+ /usr/sbin/dansguardian -g
+ eend $?
}
diff --git a/net-proxy/dansguardian/metadata.xml b/net-proxy/dansguardian/metadata.xml
index c13cb572baab..48a54d04bdc3 100644
--- a/net-proxy/dansguardian/metadata.xml
+++ b/net-proxy/dansguardian/metadata.xml
@@ -4,7 +4,18 @@
net-proxy
DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 2710812e89d1..addbba1a84fb 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,2 +1,3 @@
-DIST dante-1.1.19.tar.gz 895713 RMD160 3649207b061b95fdd5b0950ea1ece9219eb8af4c SHA1 e366a60a880ceff6205f7cd87249c7322b844d3c SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
-DIST dante-1.3.2.tar.gz 949049 RMD160 600bf1cda8795c9ba313bf89b491223ee592820a SHA1 92c559fcdee5523a4e7289d50f003eb88564d1c6 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb
+DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
+DIST dante-1.3.2.tar.gz 949049 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb
+DIST dante-1.4.0-pre1.tar.gz 1021746 SHA256 57f450bbb428648bdc9c096166a0a26eb8f8fea0800945976b4370eae1f387df SHA512 d76e1433bdaf5a177b1b596aafd14978a723fa753809df5da263f978b18c70abb1775b28d86f3e134ef77d23e4c178205a471e1570b3ffc362447f0380dde7bb WHIRLPOOL 267c944b7154bdd90358e80807d9a7478d6bcc16289dbfdd8626ebe0bc9950d69e141a6b5d6941677a17b30c790b8a624b2f47f1bcff1f55cac3d6831af25984
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
new file mode 100644
index 000000000000..dd003b6f1dd9
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.0_pre1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.1 2013/03/04 12:41:03 tomwij Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="http://www.inet.no/dante/"
+MY_P="${P/_/-}"
+SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug kerberos pam selinux static-libs tcpd"
+
+RDEPEND="pam? ( virtual/pam )
+ kerberos? ( virtual/krb5 )
+ selinux? ( sec-policy/selinux-dante )
+ tcpd? ( sys-apps/tcp-wrappers )
+ userland_GNU? ( virtual/shadow )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.0-socksify.patch
+
+ sed -i \
+ -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
+ -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
+ doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
+ || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
+ --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
+ --without-upnp \
+ $(use_enable debug) \
+ $(use_with kerberos gssapi) \
+ $(use_with pam) \
+ $(use_enable static-libs static) \
+ $(use_enable tcpd libwrap)
+}
+
+src_install() {
+ default
+
+ # default configuration files
+ insinto /etc/socks
+ doins "${FILESDIR}"/sock?.conf
+ pushd "${ED}/etc/socks" > /dev/null
+ use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
+ use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
+ popd > /dev/null
+
+ # init script
+ newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
+ newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
+
+ # example configuration files
+ docinto examples
+ dodoc example/*.conf
+
+ use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
+}
+
+pkg_postinst() {
+ enewuser sockd -1 -1 /etc/socks daemon
+}
diff --git a/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild b/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild
index cc5578ba1464..d1477f2bea99 100644
--- a/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild
+++ b/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild,v 1.5 2012/10/07 19:12:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dnsproxy/dnsproxy-1.16-r1.ebuild,v 1.6 2013/03/04 16:41:51 dastergon Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="The dnsproxy daemon is a proxy for DNS queries"
HOMEPAGE="http://www.wolfermann.org/dnsproxy.html"
SRC_URI="http://www.wolfermann.org/${P}.tar.gz"
-LICENSE="MIT"
+LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index 5f7024878b58..ff417839c3e6 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -1 +1,2 @@
DIST http-replicator_3.0.tar.gz 39291 SHA256 cd5b2c8b4b6da4fd5a9313cd5e7d4179805002f2de5fd25a42301df4f5bd161e SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57 WHIRLPOOL 965524243895a6a00df3b4be3bae391bc532f3ccef87383a487c87efbcd858aa1a2d15598be752b7640e57aef47ab7cbaad8430033925935f16a527aa50db36a
+DIST http-replicator_4.0alpha2.tgz 27575 SHA256 43f466b691244104caba96fd16df75978731ea248ad1681beaf88342a708875a SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c WHIRLPOOL 599d2ee6bab4ffb4792913763b303da3a473dee2aa15510ceee32d042e54abdb49a902eee3346c4c735c97169e11fcd2340e7c741e160500c4a6bbd064a57561
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild
new file mode 100644
index 000000000000..24d8c421ac33
--- /dev/null
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild,v 1.1 2013/03/04 13:00:40 tomwij Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2:2.7:2.7" # not 2.6 bug #33907, not 3.0 bug #411083
+inherit eutils python
+
+MY_P="${PN}_${PV/_/}"
+
+DESCRIPTION="Proxy cache for Gentoo packages"
+HOMEPAGE="http://sourceforge.net/projects/${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+src_install(){
+ # Daemon and repcacheman into /usr/bin
+ exeinto /usr/bin
+ doexe http-replicator
+ newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
+ newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
+
+ # init.d scripts
+ newinitd "${FILESDIR}/http-replicator-3.0.init" http-replicator
+ newconfd "${FILESDIR}/http-replicator-3.0.conf" http-replicator
+
+ # not 2.6 bug #33907, not 3.0 bug #411083
+ python_convert_shebangs -r 2.7 "${ED}"
+
+ # Docs
+ dodoc README.user README.devel RELNOTES
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Before starting http-replicator, please follow the next few steps:"
+ einfo "- modify /etc/conf.d/http-replicator if required"
+ einfo "- run /usr/bin/repcacheman to set up the cache"
+ einfo "- add http_proxy=\"http://serveraddress:8080\" to make.conf on"
+ einfo " the server as well as on the client machines"
+ einfo "- make sure GENTOO_MIRRORS in /etc/make.conf starts with several"
+ einfo " good http mirrors"
+ einfo
+ einfo "For more information please refer to the following forum thread:"
+ einfo " http://forums.gentoo.org/viewtopic-t-173226.html"
+ einfo
+}
diff --git a/net-proxy/nylon/nylon-1.21-r1.ebuild b/net-proxy/nylon/nylon-1.21-r1.ebuild
index eca0a79c95b2..0d22f5807b36 100644
--- a/net-proxy/nylon/nylon-1.21-r1.ebuild
+++ b/net-proxy/nylon/nylon-1.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/nylon-1.21-r1.ebuild,v 1.1 2012/10/09 21:19:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/nylon-1.21-r1.ebuild,v 1.2 2013/03/04 16:04:43 dastergon Exp $
EAPI=4
inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="A lightweight SOCKS proxy server"
HOMEPAGE="http://monkey.org/~marius/nylon/"
SRC_URI="http://monkey.org/~marius/nylon/${P}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
diff --git a/net-proxy/nylon/nylon-1.21.ebuild b/net-proxy/nylon/nylon-1.21.ebuild
index 5d083a580386..1cc26f8f4844 100644
--- a/net-proxy/nylon/nylon-1.21.ebuild
+++ b/net-proxy/nylon/nylon-1.21.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/nylon-1.21.ebuild,v 1.7 2012/07/20 01:28:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nylon/nylon-1.21.ebuild,v 1.8 2013/03/04 16:04:42 dastergon Exp $
DESCRIPTION="A lightweight SOCKS proxy server"
HOMEPAGE="http://monkey.org/~marius/nylon/"
SRC_URI="http://monkey.org/~marius/nylon/${P}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 sparc x86"
IUSE=""
DEPEND=">=dev-libs/libevent-0.6"
+RDEPEND="${DEPEND}"
src_install() {
einstall || die "make install failed"
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 510d974c4fca..24689ae93e0e 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -1 +1 @@
-DIST polipo-1.0.4.1.tar.gz 180121 RMD160 9422cece234db1b822979e32e976439a2d5757b6 SHA1 e755b585a9bba2b599a6bcc7c6f7035d3cb27bec SHA256 8d6fbfdec600d42823e483b0143704c6f179c349803028a4d2cef056b79f7cfa
+DIST polipo-1.0.4.1.tar.gz 180121 SHA256 8d6fbfdec600d42823e483b0143704c6f179c349803028a4d2cef056b79f7cfa SHA512 15c555e7751cce38b783ea28d303adb95b49577bcc39ceaa310839021af9282a1c50fa442c8dbd98bab8f685cd705383cc8e4df94aa268a4cb8e45c4a8c7c067 WHIRLPOOL 47111cf5dabf2e91b02f6127701c19f082f89c7802a77d149ea1aada7223d801c7dc0b4d3b66612e8f522279bf22351c70391261b18c29e8189e8e8420aff905
diff --git a/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild b/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild
index 1ff356596f29..0766d0640517 100644
--- a/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild
+++ b/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild,v 1.1 2011/12/31 21:11:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-1.0.4.1-r1.ebuild,v 1.2 2013/03/04 14:34:10 dastergon Exp $
-inherit eutils toolchain-funcs
+EAPI="4"
+
+inherit eutils toolchain-funcs user
DESCRIPTION="A caching web proxy"
HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
SRC_URI="http://freehaven.net/~chrisd/${PN}/${P}.tar.gz"
-LICENSE="MIT"
+LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="sys-apps/texinfo"
+RDEPEND="${DEPEND}"
pkg_setup() {
enewgroup polipo
diff --git a/net-proxy/squid/squid-3.1.23.ebuild b/net-proxy/squid/squid-3.1.23.ebuild
index 4583c9fca214..bffbf5d194f1 100644
--- a/net-proxy/squid/squid-3.1.23.ebuild
+++ b/net-proxy/squid/squid-3.1.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.2 2013/03/01 12:47:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.6 2013/03/04 18:17:26 ranger Exp $
EAPI=4
inherit eutils pam toolchain-funcs autotools linux-info user
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap icap-client \
mysql postgres sqlite \
diff --git a/profiles/license_groups b/profiles/license_groups
index a3514f3c54f3..fee8081a2ef4 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.197 2013/03/03 14:27:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.198 2013/03/04 10:01:45 jlec Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -13,12 +13,12 @@
# http://www.gnu.org/licenses/license-list.html
# GPL or LGPL with various exceptions are also included here, because
# they are more permissive than the licenses they are based on.
-GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3+ GPL-3-with-font-exception ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3+ GPL-3-with-font-exception ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 EUPL-1.1 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0
# http://www.opensource.org/licenses
-OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
+OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
# Misc licenses that are probably free software, i.e. follow the
# Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
diff --git a/profiles/package.mask b/profiles/package.mask
index 7257672815e3..501fa1d2844e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14523 2013/03/03 10:04:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14524 2013/03/04 15:55:26 mpagano Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -319,10 +319,6 @@ media-video/avidemux
# Patch tarball is broken, meaning this builds 1.2.0 (bug #452918)
=app-emulation/qemu-1.2.2-r1
-# Mike Pagano
-# Mask for testing
->=app-portage/portpeek-2.1.6
-
# Mike Gilbert
+
+
+
+ dev-zero@gentoo.org
+ Tiziano Müller
+
+
+ The dwz package contains a program that attempts to optimize DWARF
+ debugging information contained in ELF shared libraries and ELF executables
+ for size, by replacing DWARF information representation with equivalent
+ smaller representation where possible and by reducing the amount of
+ duplication using techniques from DWARF standard appendix E - creating
+ DW_TAG_partial_unit compilation units (CUs) for duplicated information
+ and using DW_TAG_imported_unit to import it into each CU that needs it.
+
+
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 41abc7f1d18d..bbd4669dcc1d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-3.2-18.base.tar.bz2 941574 SHA256 40ed12035772fa3da7410a235002d9
DIST genpatches-3.2-18.extras.tar.bz2 17186 SHA256 c97ca8a34b215445a16ca0757d847c21b0903207a276619cd88eecbd15e80f06 SHA512 f6aafd53b216d172b5f3f09b4d93faf917c36475ba08b78a4bf31b0d17c493a756dde4907c44d774cc0c9d9eac435963798a1be445dc8862057db155a06c6234 WHIRLPOOL 765cecef6c78aa1a7bbb269bce9ecda18dc02b8cdb3606461b3c40f4bc94756fd041e2f20fb4d5716491dcea1da17ca3b3ab05f7aad5ccdd87ef225ce2516a7d
DIST genpatches-3.4-16.base.tar.bz2 656970 SHA256 856877bfbf6e9244c99d82b7118be952f57a9681928f3339cb4fdc908233ebdf SHA512 d602c98fcd6396d4e442b568cc09fed7da2e494def1d0313e232d2afdfb06a14576a7b566fd43f8ad3d92ad06b458675cc0a7a3dcd238dd55d9b16c54963aff7 WHIRLPOOL e62ae74ba9f9244896676c3b69d4c72fb84b8d9983ae4c835ec805b666041036d9451ffffb71b00e07ac5d4e023f3a06d63ed6456f11a9d3d090a27331eeddc1
DIST genpatches-3.4-16.extras.tar.bz2 17519 SHA256 9ead6c8eabed8a36228528eb7a72accc06fb95b0fc63fc0e6299c23922ae2688 SHA512 7afe2ccea111ce950962942200bd946b0bad92ea866b8f644a93889d7f4416e34c620795f9eed9918b3a29deaa0a337a70d0320c3ff0e1a34930fd9406d3aac3 WHIRLPOOL 5e0d9cc8f072e362b921323b82b9c0bd85c66628814f0c606131bde32c96afdcc3806bf3b24670df195d265f737bb0ef4f3a971faa21fb7e2dc2141dda306e91
+DIST genpatches-3.4-17.base.tar.bz2 670303 SHA256 c07eb539405824c4bf77c4e37f823391698608ca3e4f16ebd13782f30d392b80 SHA512 4460798acd8c0299593c96085060210bbb3e9bd8926086a3367b83be940e83bfdcaf1c88bb3c49cf6a675c4f5aea16cc6dd973cd4b02a019bad0db24aa2fbbae WHIRLPOOL 48ff40a79b702b73eba1e03886a4cf5906a89e544a584c763a34ec8b37ea0f1d5f3a4e692364fd3c3c52dd03aae64d270d598b0f7d5fe890301ae58e16dcae68
+DIST genpatches-3.4-17.extras.tar.bz2 17519 SHA256 9ead6c8eabed8a36228528eb7a72accc06fb95b0fc63fc0e6299c23922ae2688 SHA512 7afe2ccea111ce950962942200bd946b0bad92ea866b8f644a93889d7f4416e34c620795f9eed9918b3a29deaa0a337a70d0320c3ff0e1a34930fd9406d3aac3 WHIRLPOOL 5e0d9cc8f072e362b921323b82b9c0bd85c66628814f0c606131bde32c96afdcc3806bf3b24670df195d265f737bb0ef4f3a971faa21fb7e2dc2141dda306e91
DIST genpatches-3.5-8.base.tar.bz2 256192 SHA256 ebe1a64efd39cfee3320b75a5eb0ec680587190919d3b0cec10671f220816554 SHA512 d6eaa2c4d7fe02592942b5f4a80459f18ef989ea3c5431684697074b403044f9ca83f028eb7d1db03d68debabe7fec4d68fa98925a8f0f03dd8fb0f3e03eb7df WHIRLPOOL 00f3072af8e38012ea020a4ed3100b268891045232eaebd5600c08f7872f939f4839d4b508f94c77938fc2079cae59755fb9ab41e2303983464c972c0425bb69
DIST genpatches-3.5-8.extras.tar.bz2 17497 SHA256 d5220f1746008c6592a69b9cbdf0498557c1cf4daf0c41fda2d1d76c791379ca SHA512 2327b2dd5a948cc2debc905b635bd814a97c86f10d7101fbae95d88de4e2dbadfae1890987f49e0dd5209d3951ca0c76cd8d1f039932b2aa60c0d7938ddfe1d0 WHIRLPOOL 5ec3cf00009766a761f3886737ba68397391f3e5e5e568838c3b95d54710dbee8b84e740e48efbb358a795a0175310d720d126294de0352d3494c43fa88944e8
DIST genpatches-3.6-12.base.tar.bz2 245063 SHA256 7802aa7283aa812875e60a0befcea741658a8e6a2629ba0c79013ac744ebe54a SHA512 08ceda96727ed1a96f3f73353075a756709beaefee152e2229c10455702a61a26d986ba98a0ca1b028ecca3d1fc10bce3cf8537bb6196799b2fac78b3c605980 WHIRLPOOL 2b326de2e9d8cf8f3172ee5fb7e8d9a678d7302121eca44cea9eb0a37bd0f41c5a2888097291b75d98832324be31d890096d9ee2cdf7921544884239726a5be0
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.35.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.35.ebuild
new file mode 100644
index 000000000000..535eaaac9b11
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.35.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.4.35.ebuild,v 1.1 2013/03/04 18:42:02 tomwij Exp $
+
+EAPI="3"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="17"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 615893f641e9..0ee888cd5bef 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,12 +1,15 @@
-DIST deblob-3.0 102531 RMD160 d3ea6f04cd4d6c7f652f4532e7558f931d3952d1 SHA1 3702cec9da20b8c1141e0fee2549fd475e203812 SHA256 4c9d98faabc226602891e6eb36634f1c228017bb90f0d3ceaa42d41d4b27df0f
-DIST deblob-3.2 107602 RMD160 56f1dfe4f0254c802b49ea5220c4f67e56649852 SHA1 83421184d88d02e24de2adbc5debfb03454a7f4b SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20
-DIST deblob-check-3.0 377076 RMD160 8a4f53f0a34c46fc6a2aae5878225851d7bf13e1 SHA1 b1b356f55f63746bba284644db8585d15f3da06f SHA256 72ab3f74cbcde9d453f8a4e30fd6a6339812806fe6dab3b632c1c68b90b0b104
-DIST deblob-check-3.2 423268 RMD160 8cb0c1b4a289db94543396c4445c4c7a35d2ba70 SHA1 01e50f824a577d15749f24643fdd136180342808 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638
-DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
-DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
-DIST patch-3.0.14-rt31.patch.gz 202934 RMD160 e6718f0e02943c0c700b177dc261ee76a22f509e SHA1 67a76b7a6a1ddd900656f01974708d6af1ffd7ec SHA256 c0b14e3e971b56634564763d05d0d699e2f40d6ac667bfe3d746406432305819
-DIST patch-3.0.14.bz2 334367 RMD160 65eb40920dae92d9cd11deb73851f9d387e60b44 SHA1 3603c6d001b7fe02972b618eecb874190ea1b830 SHA256 05699787bd3cb9dc9de2f900d30b175d9f7fb165330e479145aafb343351be94
-DIST patch-3.0.27-rt46.patch.gz 235004 RMD160 ed1f252a930ba20fd29e8dc808dff4f075407f80 SHA1 741e11ce9ef077fa53e9d0fbcb6c4f30a0360ca3 SHA256 c13e360b137004678d4bd9b11447bec5d9e08028385f2c27a1b9286d5f73c9c5
-DIST patch-3.0.27.bz2 513497 RMD160 4538a01ed6b5e09fd6bb4287caaec1b5745c2991 SHA1 bc79cd3320529eeb8a5659682afff30875b8b9fb SHA256 1a52c29f2c6f178f8975bf617461b2b5983fbb55bc9632539e64fc611949df40
-DIST patch-3.2.14-rt24.patch.gz 152432 RMD160 3f0f03c71ddf00919a8133ec43e487d4f2c5016f SHA1 95f4236d6841e0147bb3075182726cb6162cf8ab SHA256 50ca6e2db66fbce441abb275ec8b761624e04aa1b197013b8abd3a8e32c47111
-DIST patch-3.2.14.bz2 250692 RMD160 102319ae1a7c57d8858820dd234d89651143f0c5 SHA1 4050f825cccda37a4f7c1c52da57a7e37ce93496 SHA256 8a151b0d4d42cda22d43e4fea1c987fd0a285a30c4249eab32209d0788dbe835
+DIST deblob-3.0 102531 SHA256 4c9d98faabc226602891e6eb36634f1c228017bb90f0d3ceaa42d41d4b27df0f
+DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20
+DIST deblob-3.4 109026 SHA256 2fca296bccfa7dc25447f36975971597f67730168a9bc4db0853e55347950680 SHA512 7e6263e265dba957e966b76366566c5b318322c33ec60c9f268af1a375271cd1c1232749902832554f93451225bf61c967f314a48c2890984974d30a984d2e01 WHIRLPOOL f3d8d76078b4a372277926d1d4f3d449968acd64e57a5fbe8fc1c3057e8a9893ba1d580418598089977bb808d9a351de04181dd7f73395e99b306ba8d4886160
+DIST deblob-check-3.0 377076 SHA256 72ab3f74cbcde9d453f8a4e30fd6a6339812806fe6dab3b632c1c68b90b0b104
+DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638
+DIST deblob-check-3.4 448778 SHA256 28ce952c082e765784f9e5b63f5a3a4fb93545e5e788dc94d094c0b3ae8ea3a0 SHA512 f8f47a0adcc1b9a16c155d89d72d91a02d47bdbb3ac3a353be3873dc868fa44451367b7bb3906817d1ca8f51b64c99ce381d2fa3121582b70c7c2efb18dfc579 WHIRLPOOL 37d219204e15e0c81ac43faed93f7a5051735c474efb2b5167117cd463fbe81167267b756e8ce546447a30ad5bac651c943401ed98ec61713e20af89aa4fb957
+DIST linux-3.0.tar.bz2 76753134 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
+DIST patch-3.0.27-rt46.patch.gz 235004 SHA256 c13e360b137004678d4bd9b11447bec5d9e08028385f2c27a1b9286d5f73c9c5
+DIST patch-3.0.27.bz2 513497 SHA256 1a52c29f2c6f178f8975bf617461b2b5983fbb55bc9632539e64fc611949df40
+DIST patch-3.2.14-rt24.patch.gz 152432 SHA256 50ca6e2db66fbce441abb275ec8b761624e04aa1b197013b8abd3a8e32c47111
+DIST patch-3.2.14.bz2 250692 SHA256 8a151b0d4d42cda22d43e4fea1c987fd0a285a30c4249eab32209d0788dbe835
+DIST patch-3.4.33-rt47.patch.bz2 125616 SHA256 3992352d95e436858ab0739e27a11ec70395c1cf9807cb97e76d821ac52b198e SHA512 a22328763f482d8455a2b0560c8b8517435b595c15009c9331c30e06817951eedf23a004a1d6148b7760be3c61b967f835028adf0aed8fdd0359c5909ab0a7dd WHIRLPOOL 817f580aa82454eefbda0b53f20a88db6dd9ac7698e23b5f87e2dcf3e4914c0a39de36ca4d6db01142b25caaa593692d2f723a0bea8516e2eb28d4b15a02c465
+DIST patch-3.4.33.bz2 566808 SHA256 ba5bc6bc1f6d3d0ca5c0b269386960359f7423366774c186fa958fba69f16d30 SHA512 7915996204ba14b5ef8b1616a3bfabde7e416f09e8c2507b1537489426c37ddd335506bd1584615577584f412292aaaf6709b553418cb37ac745dd712fee2034 WHIRLPOOL aa50ed2e8ac8759f79b82004c678657d3aa498c48906d43f323aa781951988ea577a0031799036de875dffe06d5c839bdea5985c1f06baf562ae6a6575ed906f
diff --git a/sys-kernel/rt-sources/metadata.xml b/sys-kernel/rt-sources/metadata.xml
index 50632b3f3b14..79a16507c5d7 100644
--- a/sys-kernel/rt-sources/metadata.xml
+++ b/sys-kernel/rt-sources/metadata.xml
@@ -6,6 +6,10 @@
psomas@gentoo.org
Stratos Psomadakis
+
+ eric-f.garioud@wanadoo.fr
+ Eric F. GARIOUD
+
Real-time patchset for the Linux Kernel
diff --git a/sys-kernel/rt-sources/rt-sources-3.0.14_p31.ebuild b/sys-kernel/rt-sources/rt-sources-3.4.33_p47.ebuild
similarity index 59%
rename from sys-kernel/rt-sources/rt-sources-3.0.14_p31.ebuild
rename to sys-kernel/rt-sources/rt-sources-3.4.33_p47.ebuild
index 8dfff2311afc..ace1fb1f6a34 100644
--- a/sys-kernel/rt-sources/rt-sources-3.0.14_p31.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-3.4.33_p47.ebuild
@@ -1,51 +1,44 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.0.14_p31.ebuild,v 1.2 2012/01/15 19:15:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.4.33_p47.ebuild,v 1.1 2013/03/04 11:23:41 psomas Exp $
EAPI="2"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/projects/rt/"
inherit versionator
-COMPRESSTYPE=".gz"
-K_USEPV="yes"
-UNIPATCH_STRICTORDER="yes"
+CKV="$(get_version_component_range 1-3)"
K_SECURITY_UNSUPPORTED="yes"
K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
-CKV="$(get_version_component_range 1-3)"
-ETYPE="sources"
inherit kernel-2
detect_version
-RT_PATCHSET="${PV/*_p}"
-RT_KERNEL="${PV/_p[0-9]*}"
-RT_KERNEL="${RT_KERNEL/_/-}"
-RT_FILE="patch-${RT_KERNEL}-rt${RT_PATCHSET}.patch${COMPRESSTYPE}"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${KV_MAJOR}.${KV_MINOR}/${RT_FILE}"
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.bz2"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE}"
-DESCRIPTION="Real-time patchset for the Linux Kernel"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/projects/rt/"
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
SRC_URI="${KERNEL_URI} ${RT_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="deblob"
-
KV_FULL="${PVR/_p/-rt}"
-EXTRAVERSION="-rt${RT_PATCHSET}"
S="${WORKDIR}/linux-${KV_FULL}"
-pkg_setup(){
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_postinst(){
+
ewarn
ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
ewarn "If you need support, please contact the RT project developers directly."
ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
ewarn "the ebuilds."
ewarn
- kernel-2_pkg_setup
-}
-
-src_prepare(){
- epatch "${DISTDIR}"/"${RT_FILE}"
}
K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index a5e39635abb3..a48f854fd71b 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -24,10 +24,13 @@ DIST linux-3.7.tar.bz2 83671392 SHA256 dc08d87a579fe2918362e6666e503a95a76296419
DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
DIST patch-2.6.32.60.bz2 987764 SHA256 611dbc724cd43617baff4500b0c8470889e4c6071f6ab916bfee7d097783394c SHA512 8228a7a6f7264b1a20802411c13f0d194fd48f5f5965cb96bfac0410b2a945b53c8e458eddafa58247125d3ba04e17dd68636302b57654934046a8bc0538834f WHIRLPOOL 834a654a5cb261226c57295ea3c60f5e405b11197103c4cd8721ff78adb3bbc4ced2c757492ee3b70735c8c28dd0717bfafeb9181280034b764bae18f2ab47b0
DIST patch-3.0.67.bz2 853704 SHA256 ff3cf83bdf579c9fedb74297ee149348ff24e8aeb6e6983a0f2dfa70a56a073f SHA512 7af3e2fdda7891e9a30ee6a8fba13cdabc3438c4128e8da1922cdaad3e033708d2031dc76b0fddf22221d2649f06a8f7900b14cdb64133080fda62c77f4291c0 WHIRLPOOL a970549363b9d12a2c9045086aa2adbea7164b6f67793cf90269832f71bc98662b1683c02199041722ba8e39fb46c8e9454753e0c845cad25c421bd4f45c3822
+DIST patch-3.0.68.bz2 861139 SHA256 8f9f89cff7577974561b5529ccb916019b15097903bd641bdfb04f84fc6ae8d4 SHA512 6e4fa181ecb358c4034214846e64790490b63757bfb66d366667498aedf638aa56a25e9748cd287f04fc81239ea7db3046eece94260ef0ba0074e7b2b3e34532 WHIRLPOOL 9f7ec93f2c4056d9b7746c4ff3d00711a7edf96a5fb4dddd875fb369915e14b42130760505e633a3c037d14988c0018d60f38e36693e636090a708369e2d36a4
DIST patch-3.2.39.bz2 807098 SHA256 640b8cf641d5b381ccc97de2010f68518d941fad43f387b0c313ef6fc9b7d334 SHA512 f0f6b82c85b22e0b523f7c59f5a868b7d7d2bd923af07a155498e6b5397e12ef5e97103994b3c6d981e1ba06dbe334fb8d8591e8e2ac8db7a3c770fe09125be8 WHIRLPOOL 9c1829ca81d85a5b7513fea7522bdc84e2f5c46215d77bdb8baeadf1a040f2827c0cdbab64bb866376364ea9bc9f8b68c06252f661979fa50569ce96cf08b1d0
DIST patch-3.4.34.bz2 587966 SHA256 c556b6e36f8e64ec0f59b189ece5b9b5a099deda4c077f42d17ce004945fa47a SHA512 7e5ca54ac0d7e4c9d5f683a4a2b054e398c20d2ab02cbe5d2c1bfa64b30d36c587286b7fe469c3e284ecf65dc7fc8cc490a366400466739f7bca104a35525a08 WHIRLPOOL 54f3ff45d1b0db8cfe916314f057b245a3886fdff13060bd337ac6ae6784f420bab673a6efbd027c7d5036a116f202f3b010f699ede80a92c5b5d7fa2de7683f
+DIST patch-3.4.35.bz2 595569 SHA256 68c13278c8970fe62015369b9741dd0e0307adfbdda06166717c046c999ebc8e SHA512 e5a95ab19c46ccb9b19afda66dbb2ef6be66f14abbc9f2afd4363eb516c874b2430b4816a4368df46f3e839212b8998d3ce60bbd1768d258a88fe64b2a1b9a0d WHIRLPOOL c1973506fe939d86ec48e4a1676cbad1c883c800aad7de42d2845d3dd7a99c50fe853245990d867c314ff66fbcb7e1b0e58de174c910b5e324f1d223bca0de3b
DIST patch-3.5.7.bz2 241834 SHA256 c064888f2c815353b2ca483935a9e79572e2d033559b73971f7f32c8eaa4b66f SHA512 024bfbd23905805bf6ce8326b9e69b2d9cd539038cc8c00f3145b8a482caa6eec3993771c69800784ebab0d9c3d43910a9bd5e561012c67df44f663cfd61afc0 WHIRLPOOL 98239024aa4a702aa80fd53b2efb8614ab64eb23c2b35aeb75bc858ca3df4c05f986dd517f455c8fa04ce05079bd03ac1bc974b873e12f431fa773d7766f7015
DIST patch-3.6.11.bz2 229142 SHA256 bd25c577b623468286d228ef5e09f4126e1c16ed22fb1cfeebc80e47a40b1de1 SHA512 bd59c0cf8a1208161633344444de4e4b8ef1d536ab4c095cbf402dded968daa9b0cccf35eeaf4ec243a66de5fdfe84b3e5755f972854559af38221614b1c6665 WHIRLPOOL 67cd2b7a40407de46c1e9308ef3807a07e5df7338c7cc8dd08c380ece42c20d5e34acafde2861e3bdeced71523e764421c633172f563d39840f54130dabacb3e
DIST patch-3.7.10.bz2 218843 SHA256 9ef0eb96b7c35bb45cc391c18309497ab40929dfd70dc6f7e493d08fe7f3f26a SHA512 3a09341eeed28dd79069da1bbddb04b88f94d98aefe087df6ce9d452851f48d8d0810cc0fb41686ed0b5df0878b6a831638e11764d52cb1f6269b22b5dac88de WHIRLPOOL 6e30bffc74365adef819cc4d783c1cccf79a5bdaae2e2a3e0b1299d30f0e2f2e069e26f7883bb05c99ecf92f9dc2ff152e148592bb49f0f5654b06173f24328c
DIST patch-3.7.9.bz2 200016 SHA256 01400628da043a99724f04ab021d40d0756a7a9c02d662f4a7e267e88c5b943f SHA512 b5ed83363abb59feb65894d44b36c7263daf974f9e85084824858a2357324298a3c988e5377af160f61ae89da56947d3c4921f5100ab9af536816dcd7ae350be WHIRLPOOL 8e32befa516b682104626a2535ddb440607faf0138eb4e225959406ab60f67b2baef4b24a49e2036d3a52950e7e4582a97282cadf6453724473aa50ee8d62712
DIST patch-3.8.1.bz2 57380 SHA256 7b8fee82e5f4889befb8de2fa526fb54d268d011c4b2972d4ff969653b67a353 SHA512 5bee2169eb4f92644b858de60757705f412be35ab304ec90949f3943f353dfc5626647b8c63d0d637154f17b97a82c9cd23589a42cfa90625ff64b64c91fa8a1 WHIRLPOOL b0e265e1917670c4ba05e98841cfb8037c05d3f83df0f0f4802d05dbd4f148c1053ee60220caef59c4bc4340819bf4b83105eb6b9c60cf83565e26f0def13dac
+DIST patch-3.8.2.bz2 83579 SHA256 aa892ebc5d6f472746f836d966abed30695acbdf93602dfbad136ad2d2b8f651 SHA512 8f32b72ab3f1bc6676c788d7c9943f10906976387f0f5aa40d5cfc56089fcdc56881180862921a97f3bc745cc464ea8e848c601f71820fc3e17aca8d1053bb29 WHIRLPOOL 2a4adb63d63cf23a7767d4a6cbf37d660095c17767de9ba214c2f353a3de65e9619f1b612af30d2806dfe5d8123d20fb17c18483405f5a244ff233304ad0824c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.68.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.68.ebuild
new file mode 100644
index 000000000000..250a2406132f
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.0.68.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.0.68.ebuild,v 1.1 2013/03/04 17:25:55 ago Exp $
+
+EAPI="2"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.4.35.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.35.ebuild
new file mode 100644
index 000000000000..b48040a3f96c
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.4.35.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.4.35.ebuild,v 1.1 2013/03/04 17:25:55 ago Exp $
+
+EAPI="2"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.8.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.8.2.ebuild
new file mode 100644
index 000000000000..7133317873df
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.8.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.8.2.ebuild,v 1.1 2013/03/04 17:25:55 ago Exp $
+
+EAPI="2"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/www-client/rekonq/rekonq-2.2.ebuild b/www-client/rekonq/rekonq-2.2.ebuild
index 99f62ee952d7..a86245bbeb69 100644
--- a/www-client/rekonq/rekonq-2.2.ebuild
+++ b/www-client/rekonq/rekonq-2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-2.2.ebuild,v 1.2 2013/03/04 08:59:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-2.2.ebuild,v 1.3 2013/03/04 14:45:41 kensington Exp $
EAPI=5
@@ -8,6 +8,7 @@ WEBKIT_REQUIRED="always"
KDE_LINGUAS="cs da de el es et fi fr hu ia it km mr nb nl pl pt pt_BR sk sl
sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
KDE_HANDBOOK="optional"
+KDE_MINIMAL="4.10"
inherit kde4-base
DESCRIPTION="A browser based on qtwebkit"
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 02839e103151..833bb4812277 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,2 +1,3 @@
DIST lightspark-0.6.0.1.tar.gz 862495 SHA256 b9d638a45bb274da046e6fd7f7300547ba81c2480ce626158af2fd62312c5b86 SHA512 bd5db376ed4cf98caa053423f136022bc36ca36c490ff30033e35ccaf72b854cbc6dcc7a38834e938fd58037c5e1a60f652e0a225368fc9483f375800fff6412 WHIRLPOOL f03ae222bb194be95baff56b7983d93f1fdcecaa3ed02b690151f0d26ef2757f2fa5b805a9d4371966d1a25cb60e033aead0414ce563724606248190deaa8e7d
DIST lightspark-0.7.0.tar.gz 910146 SHA256 f3df63692ad8409888336a58f4db96b3344737d492df3a3f06c7359fdf26c85b SHA512 d4e25dbd60d7bc3a4a50eb0708fe8c7f5b940006f598b7a5939ff8d596e6618502793cfde62839343ac8403d76d62fc127c0262a595ff57b54932db6d50c8b70 WHIRLPOOL f124345deb5c93577b725e54f01589b97566d6d0424637c58b4c7b58c297fc95b2cdd6a69df84ec2de76b7fc9c57e022de93565dd4e39d3191ab6bad79a77b71
+DIST lightspark-0.7.1.tar.gz 920218 SHA256 a6f9ef13ddf3ebd700d4daaeeb4e9497889c18697aeca1ddcb30ac8cdc20e931 SHA512 a8c10782f144cf4b9a39d32ca4c78f441957550f790161671fa52fec686672f22ab977b41c55b5e33d1e65eaa28e78bf48e729ce01f51b56ef24d2d09e62eeae WHIRLPOOL 0842b113070cc679d8e960e558bf4d7562f6796f60b923fc4fe41f3e20f4cb86da0340d8f27543d86c2cf6aefaf1232990c9ef51bcdcb765dc89befee16823cc
diff --git a/www-plugins/lightspark/lightspark-0.7.1.ebuild b/www-plugins/lightspark/lightspark-0.7.1.ebuild
new file mode 100644
index 000000000000..5b9cb7753624
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.1.ebuild,v 1.1 2013/03/04 17:29:26 chithanh Exp $
+
+EAPI=4
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+ >=dev-libs/boost-1.42
+ dev-libs/libpcre[cxx]
+ media-fonts/liberation-fonts
+ media-libs/libpng
+ media-libs/libsdl
+ >=sys-devel/gcc-4.6.0[cxx]
+ >=sys-devel/llvm-3
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/pango
+ curl? (
+ net-misc/curl
+ )
+ ffmpeg? (
+ virtual/ffmpeg
+ )
+ !gles? (
+ >=media-libs/glew-1.5.3
+ virtual/opengl
+ )
+ gles? (
+ media-libs/mesa[gles2]
+ )
+ pulseaudio? (
+ media-sound/pulseaudio
+ )
+ rtmp? (
+ media-video/rtmpdump
+ )
+ virtual/jpeg"
+DEPEND="${RDEPEND}
+ amd64? ( dev-lang/nasm )
+ x86? ( dev-lang/nasm )
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+ eerror "You need at least sys-devel/gcc-4.6.0"
+ die "You need at least sys-devel/gcc-4.6.0"
+ fi
+ fi
+}
+
+src_configure() {
+ local audiobackends
+ use pulseaudio && audiobackends+="pulse"
+ use sdl && audiobackends+="sdl"
+
+ local mycmakeargs=(
+ $(cmake-utils_use curl ENABLE_CURL)
+ $(cmake-utils_use gles ENABLE_GLES2)
+ $(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+ $(cmake-utils_use nsplugin COMPILE_PLUGIN)
+ $(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+ $(cmake-utils_use profile ENABLE_PROFILING)
+ $(cmake-utils_use rtmp ENABLE_RTMP)
+ -DAUDIO_BACKEND="${audiobackends}"
+ -DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+ # default to sdl audio if pulseaudio plugin is not built, bug #406197
+ if use sdl && ! use pulseaudio; then
+ sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+ fi
+}
+
+pkg_postinst() {
+ if use nsplugin && ! has_version www-plugins/gnash; then
+ elog "Lightspark now supports gnash fallback for its browser plugin."
+ elog "Install www-plugins/gnash to take advantage of it."
+ fi
+ if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
+ elog "Having two plugins installed for the same MIME type may confuse"
+ elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+ elog "USE flag for either gnash or lightspark. For details, see"
+ elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+ fi
+}
diff --git a/www-servers/apache/apache-2.4.4.ebuild b/www-servers/apache/apache-2.4.4.ebuild
index 516c5578aca1..3d18913be52b 100644
--- a/www-servers/apache/apache-2.4.4.ebuild
+++ b/www-servers/apache/apache-2.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4.ebuild,v 1.2 2013/03/04 09:00:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4.ebuild,v 1.5 2013/03/04 18:31:47 ranger Exp $
EAPI="2"
@@ -119,7 +119,7 @@ HOMEPAGE="http://httpd.apache.org/"
# some helper scripts are Apache-1.1, thus both are here
LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND="${DEPEND}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index b46093a04fa1..dd84ab409d29 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,3 +3,4 @@ DIST uwsgi-1.2.6.tar.gz 515869 SHA256 49d2fbedbd42b3c95a684f7ddf43302f881297f361
DIST uwsgi-1.4.4.tar.gz 589158 SHA256 419f45aea5469b6bec5b20e0edfe481c91a5efcd150cfaa49ca977bc14beddb9 SHA512 0736edadcda323ee4923c3163996e27eb3b7cb6c6603055c63ba527cc7408c3e39448cdc35e70ceec0dd4551e1a451ed04e2cf7bc6a3ca39726f144a0b818813 WHIRLPOOL 0d5be288a5e8b685ddbec922fee3ee0068143aabf6c7a3b38f68f20b9ca63775d8212ac0584b85e57352adb460a1c851e3605e9018d9ec65d59d8c4c03fbd4c1
DIST uwsgi-1.4.5.tar.gz 589985 SHA256 5c17f09d0f8d5a4f3385c791e91ca71975b8ccb0c0b94620f9f924c21ef30f3a SHA512 f9b4da6eff9c20f0dcf1e46a4fb7b8dd348bc38ef307ceafc4de40e0d8ab06f33a967977db7194cb07ecb7690e3c8bb599cbd9586bec7336c34113deda82a64b WHIRLPOOL c806e42ae72ba0490189c70a12aae8fe3037d98d461ccc773e847c7e16394b98a89e1ef3262496a9abda4f3985547dbd098af535bf20e127325629a0adefaf3a
DIST uwsgi-1.4.6.tar.gz 591470 SHA256 731b57574dc8c6bc270233b689157433ababd0b611dbaeb16a11b6608d1deb80 SHA512 ea022ceae4e43f4ae0bde390f2a78f688d01c0beea91593820ab5602d418564a289a44c7a8bef4449ab0b7e5b7511a9c1f2e4b2609bdb063f526eebd8a1dd9a7 WHIRLPOOL 25f2f773d88d8c83796eda75a1f824b303fd9c5a55a512d2dc97824bef3bbbf4512641aa99eefa60a5044e577dd9a2f43e91b560db706bb6a96dde668907cef0
+DIST uwsgi-1.4.8.tar.gz 592776 SHA256 3c35893927a065ed89775cf5a8f66f66d71b060618f4611efbcca76e520aac37 SHA512 7ead90c0740db0ebc28256b312a98e8de610b62cc82504c738cc2f3d2b0819ae673eb1875ea31abc3e511dc76db9af9fb15f4d1ae2a62f6b67b2a5966cfe2bab WHIRLPOOL da750b61916a99a9cea314dc57ca8e02920fbc3431977f6ad55368dc65a42fe6f297aae509fe7df23607a5b3f6097466e939b3a22650c90fcc7ed00bc78d9f0c
diff --git a/www-servers/uwsgi/uwsgi-1.4.8.ebuild b/www-servers/uwsgi/uwsgi-1.4.8.ebuild
new file mode 100644
index 000000000000..8bf5851e9416
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-1.4.8.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.4.8.ebuild,v 1.1 2013/03/04 11:14:32 ultrabug Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? *"
+PYTHON_MODNAME="uwsgidecorators"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+USE_RUBY="ruby18 ree18 ruby19"
+RUBY_OPTIONAL="yes"
+PHP_EXT_NAME="dummy"
+PHP_EXT_INI="no"
+USE_PHP="php5-3 php5-4" # deps must be registered separately below
+PHP_EXT_OPTIONAL_USE="php"
+
+MY_P="${P/_/-}"
+
+inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
+
+# util-linux is required for libuuid when requesting zeromq support
+CDEPEND="caps? ( sys-libs/libcap )
+ json? ( dev-libs/jansson )
+ erlang? ( dev-lang/erlang )
+ gevent? ( >=dev-python/gevent-1.0_beta2 )
+ graylog2? ( sys-libs/zlib )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl )
+ php? (
+ php_targets_php5-3? ( dev-lang/php:5.3[embed] )
+ php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+ )
+ probepg? ( dev-db/postgresql-base:= )
+ ruby? ( $(ruby_implementations_depend) )
+ sqlite? ( dev-db/sqlite:3 )
+ rsyslog? ( app-admin/rsyslog )
+ xml? ( dev-libs/libxml2 )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq sys-apps/util-linux )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
+
+want_apache2_2
+
+use_true_false() {
+ if use $1 ; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
+src_unpack() {
+ default
+}
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/1.1.2-threaded-php.patch" \
+ "${FILESDIR}/1.2.3-pyerl.patch"
+
+ sed -i \
+ -e "s|'-O2', ||" \
+ -e "s|'-Werror', ||" \
+ -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+ uwsgiconfig.py || die "sed failed"
+
+ sed -i \
+ -e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
+ plugins/python/uwsgiplugin.py || die "sed failed"
+
+ sed -i \
+ -e "s|/lib|/$(get_libdir)|" \
+ plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+ local plugins=""
+ use carbon && plugins+=", carbon"
+ use graylog2 && plugins+=", graylog2"
+ use nagios && plugins+=", nagios"
+ use pam && plugins+=", pam"
+ use rrdtool && plugins+=", rrdtool"
+ use rsyslog && plugins+=", rsyslog"
+ use syslog && plugins+=", syslog"
+
+ # Notes:
+ # * the embedded_plugins mostly follows the list of embedded_plugins
+ # in buildconf/base.ini, make sure you compare the list when bumping uWSGI
+ # * thus: keep the order in embedded_plugins the same as in the base.ini
+ cat > "buildconf/gentoo.ini" << EOF
+[uwsgi]
+xml = $(use_true_false xml)
+ini = true
+yaml = $(use_true_false yaml)
+json = $(use_true_false json)
+sqlite3 = $(use_true_false sqlite)
+zeromq = $(use_true_false zeromq)
+snmp = true
+sctp = false
+spooler = true
+embedded = true
+ssl = auto
+udp = true
+multicast = true
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+evdis = false
+ldap = $(use_true_false ldap)
+pcre = $(use_true_false pcre)
+routing = auto
+alarm = auto
+debug = $(use_true_false debug)
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = libyaml
+malloc_implementation = libc
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = /usr/$(get_libdir)/uwsgi
+plugin_build_dir = ${T}/plugins
+embedded_plugins = ping, cache, rpc, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter ${plugins}
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+embed_files =
+
+embed_config =
+[python]
+paste = true
+web3 = true
+EOF
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+ use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+
+ if use probepg ; then
+ PGPV="$(best_version dev-db/postgresql-base)"
+ PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-base-})"
+ sed -i \
+ -e "s|pg_config|pg_config${PGSLOT/.}|" \
+ plugins/probepg/uwsgiplugin.py || die "sed failed"
+ fi
+}
+
+each_ruby_compile() {
+ cd "${WORKDIR}/${MY_P}"
+
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+
+ if [[ "${RUBY}" == *ruby19 ]] ; then
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed"
+ fi
+}
+
+install_python_lib() {
+ insinto $(python_get_sitedir)
+ doins uwsgidecorators.py
+}
+
+src_compile() {
+ python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+ mkdir -p "${T}/plugins"
+
+ if use erlang ; then
+ python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
+ fi
+
+ if use lua ; then
+ # setting LUALIB explicitly since lua is not slotted on Gentoo
+ # and uwsgi otherwise looks for lua5.1
+ UWSGICONFIG_LUALIB="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+ fi
+
+ if use perl ; then
+ python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
+ fi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+ done
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
+
+ if use gevent ; then
+ python${a} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${a/.} || die "building plugin for gevent-support in python-${a} failed"
+ fi
+ if use erlang ; then
+ python${a} uwsgiconfig.py --plugin plugins/pyerl gentoo pyerl${a/.} || die "building plugin for erlang-support in python failed"
+ fi
+ done
+ fi
+
+ if use ruby ; then
+ ruby-ng_src_compile
+ fi
+
+ if use spooler ; then
+ python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
+ fi
+
+ if use cgi ; then
+ python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed"
+ fi
+
+ if use probepg ; then
+ python uwsgiconfig.py --plugin plugins/probepg gentoo || die "building plugin for postgresql probe failed"
+ fi
+
+ if use apache2 ; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ dobin uwsgi
+ pax-mark m "${D}"/usr/bin/uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+ use erlang && dosym uwsgi /usr/bin/uwsgi_erlang
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
+ use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ dosym uwsgi /usr/bin/uwsgi_${s/.}
+ done
+ fi
+
+ if use python ; then
+ python_execute_function install_python_lib
+ for a in ${PYTHON_ABIS} ; do
+ dosym uwsgi /usr/bin/uwsgi_python${a/.}
+ done
+ fi
+
+ if use apache2; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+ apache-module_src_install
+ done
+ fi
+
+ newinitd "${FILESDIR}"/uwsgi.initd-r3 uwsgi
+ newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
+ keepdir /etc/"${PN}".d
+ use spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+ elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+ elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+ elog "Therefore you can enable only one of them at a time."
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+ elog "mod_proxy_uwsgi is the newest and not considered ready for production yet."
+ fi
+
+ elog "Append the following options to the uwsgi call to load the respective language plugin:"
+ use cgi && elog " '--plugins cgi' for cgi"
+ use erlang && elog " '--plugins erlang' for erlang"
+ use lua && elog " '--plugins lua' for lua"
+ use perl && elog " '--plugins psgi' for perl"
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ elog " '--plugins ${s/.}' for ${s}"
+ done
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ elog " '--plugins python${a/.}' for python-${a}"
+ use gevent && elog " '--plugins python${a/.},gevent${a/.}' for gevent support in python-${a}"
+ use erlang && elog " '--plugins python${a/.},erlang,pyerl${a/.}' for erlang support in python-${a}"
+ done
+ fi
+
+ if use ruby ; then
+ for ruby in $USE_RUBY; do
+ use ruby_targets_${ruby} && elog " '--plugins rack_${ruby/.}' for ${ruby}"
+ if [[ "${ruby}" == *ruby19 ]] ; then
+ elog " '--plugins fibre' for ruby-1.9 fibres"
+ fi
+ done
+ fi
+}
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 95f271be6765..f8ba0ea9f4e4 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,4 +1,4 @@
-DIST qwt-5.2.1.tar.bz2 1926453 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
+DIST qwt-5.2.1.tar.bz2 1926453 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f SHA512 9c434a268c2599602462a5d77688b41627f62e117a7cb9a0c0c80dccb196b0bc00a04fbc18670905e2a1d7de9e343126b8105d8852ad85e2ea6de0c93fe65d5e WHIRLPOOL d859eb7afe3c79e937a9cd6bfa48ba74292e6edd6a5dd8094ded2b369be6b3be30c11b28a1f21b903626d5a85a33431e2f2f98e17c6e30cf429889f620aadf72
+DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
-DIST qwt-6.0.1.tar.bz2 2437570 SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2 SHA512 36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610 WHIRLPOOL 2c6cf1bf0431cae719860414bcd17d3e682fdee785980a435f0d7a1a1b45584d200be1e6dcc352f4f56d3aa17262eea59953bbdeb27f2b5c84d72fa6af6b8bcf
DIST qwt-6.0.2.tar.bz2 2688469 SHA256 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f SHA512 ddf5d50196cf8f3f33a2c935de891474d73b26e529bd4a8873d8c71d7d183242f9289f6ef4a0847c7ca067d30b593d0efc27944f77bb50027df932ea40e19c67 WHIRLPOOL 26e1de7bf7d56ebd72d82ba355a8b74bec289397d3ab70415f69974d7733756635564062a00a93df9763f1f9c14eff19de0aa0b6aec1dd4c098470ecd1381eea
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 5927e4d57e6e..c4e96218194d 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -1,15 +1,15 @@
- sci
-
+ sci
+
The Qwt library contains GUI Components and utility classes which are
primarily useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials,
compasses, thermometers, wheels and knobs to control or display
values, arrays or ranges of type double.
-
+
diff --git a/x11-libs/qwt/qwt-5.2.3.ebuild b/x11-libs/qwt/qwt-5.2.3.ebuild
new file mode 100644
index 000000000000..0adcf5fe7e5c
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3.ebuild,v 1.1 2013/03/04 18:30:58 jlec Exp $
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="5"
+IUSE="doc examples static-libs svg"
+
+DEPEND="
+ dev-qt/qtgui:4
+ doc? ( ! qwtconfig.pri <<-EOF
+ target.path = "${EPREFIX}/usr/$(get_libdir)"
+ headers.path = "${EPREFIX}/usr/include/qwt5"
+ doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+ CONFIG += qt warn_on thread release
+ CONFIG += QwtDll
+ CONFIG += QwtPlot QwtWidgets QwtDesigner
+ VERSION = ${PV}
+ EOF
+ sed -i -e 's/headers doc/headers/' src/src.pro || die
+ use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+}
+
+src_compile() {
+ building() {
+ # split compilation to allow parallel building
+ emake sub-src
+ emake
+ }
+ building
+
+ if use static-libs; then
+ sed "/QwtDll/d" -i qwtconfig.pri || die
+ eqmake4
+ building
+ echo "CONFIG += QwtDll" >> qwtconfig.pri || die
+ fi
+}
+
+src_test() {
+ cd examples || die
+ eqmake4 examples.pro
+ emake
+}
+
+src_install () {
+ qt4-r2_src_install
+
+ use static-libs && dolib.a lib/libqwt.a
+
+ insinto /usr/share/doc/${PF}
+ if use doc; then
+ rm doc/man/*/*license*
+ doman doc/man/*/*
+ doins -r doc/html
+ fi
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt5"
+ LIBS += -lqwt
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp qwtconfig.pri examples/qwtconfig.pri || die
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.0.1-r1.ebuild b/x11-libs/qwt/qwt-6.0.1-r1.ebuild
deleted file mode 100644
index 0a0a08fea39b..000000000000
--- a/x11-libs/qwt/qwt-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild,v 1.2 2013/03/02 23:46:23 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
-SLOT="6"
-IUSE="doc examples svg"
-
-DEPEND="
- dev-qt/qtgui:4
- doc? ( ! qwtconfig.pri <<-EOF
- QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
- QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
- QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
- QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
- VERSION = ${PV/_*}
- QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
- EOF
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- # don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
- include( qwtconfig.pri )
- TEMPLATE = app
- MOC_DIR = moc
- INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
- DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
- LIBS += -lqwt
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- sed \
- -e 's/target doc/target/' \
- -i src/src.pro || die
-
- # Renaming lib to libqwt6.so to enable slotting
- sed \
- -e "/^TARGET/s:qwt:qwt6:g" \
- -i src/src.pro || die
- sed \
- -e '/qtAddLibrary/s:qwt:qwt6:g' \
- -i qwt.prf designer/designer.pro || die
- sed \
- -e 's:libqwt:libqwt6:g' \
- -i qwtbuild.pri || die
-
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
- cp *.pri examples/ || die
-}
-
-src_compile() {
- # split compilation to allow parallel building
- emake sub-src
- emake
-}
-
-src_install () {
- qt4-r2_src_install
- if use doc; then
- dohtml -r doc/html/*
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/x11-libs/qwt/qwt-6.0.1.ebuild b/x11-libs/qwt/qwt-6.0.1.ebuild
deleted file mode 100644
index 489172f087ce..000000000000
--- a/x11-libs/qwt/qwt-6.0.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.4 2013/03/02 23:46:23 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
-SLOT="6"
-IUSE="doc examples svg"
-
-DEPEND="
- dev-qt/qtgui:4
- doc? ( ! qwtconfig.pri <<-EOF
- QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
- QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
- QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
- QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
- VERSION = ${PV/_*}
- QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
- EOF
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- # don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
- include( qwtconfig.pri )
- TEMPLATE = app
- MOC_DIR = moc
- INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
- DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
- LIBS += -lqwt
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- sed \
- -e 's/target doc/target/' \
- -i src/src.pro || die
-
- # Renaming lib to libqwt6.so to enable slotting
- sed \
- -e "/^TARGET/s:qwt:qwt6:g" \
- -i src/src.pro || die
- sed \
- -e '/qtAddLibrary/s:qwt:qwt6:g' \
- -i qwt.prf designer/designer.pro || die
- sed \
- -e 's:libqwt:libqwt6:g' \
- -i qwtbuild.pri || die
-
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
- cp *.pri examples/ || die
-}
-
-src_compile() {
- # split compilation to allow parallel building
- emake sub-src
- emake
-}
-
-src_install () {
- qt4-r2_src_install
- if use doc; then
- dohtml -r doc/html/*
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index dd9dbdd5cb18..315257b778c1 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,2 +1,2 @@
DIST arandr-0.1.6.tar.gz 76064 SHA256 252bbeab69dae3c8e2176883e09ccfa8b4309905964bc8a2aab26cec2b33743f SHA512 4dc98d7c8a9ec05e5040e6c29f99aa991b79444c583fbc38ad8b2a11844f748f021ed7cd93754809230c28bc9af21bea841754c09dc80cce7198efb0cb0b56c4 WHIRLPOOL 789904c233decb272a93c99e36b977ee3ede99291b913317afda29c4c901b07b5b9c1167a45cdbe4e0ac63dbc0555be71295430e75ac9ac532c608dfc7aecd41
-DIST arandr-0.1.7.tar.gz 81386 SHA256 99de611220dab67f488735bd5b52ceabbddce0606e0cfd8ff80151be91fb7f43 SHA512 bb35ef99e11a37dd4567caf0abbacbc490df181719cb052ab0d15ea25c44e5f51d1a82ea6d6d81c1d5588cb1effba188ab7ccbd82a27acc07772ca632ac9701e WHIRLPOOL e7a2253971bcc4e3740871a03be8899e63a76c6791c576cea014cc18e28b320c005951c3856731fc6b271328e98a6866d18d42f20783bdd9a3cca049f7d62689
+DIST arandr-0.1.7.1.tar.gz 82118 SHA256 ab73aa90d05d48b95a01afdad37b7c21a2cdf4af98f7d78b2502b819382748da SHA512 1e3b8ec0d98d38515a159c7695abefd7451a3fa6b7d43641766c997aab63152dfa76c2d9208ba2848ce588dd033a8e85ae31b97acdd4aa5e450fd87725cc21ce WHIRLPOOL 9f9844cb0cb14fcba17767a1b50270843c70859253d96c23d3d47c65b64d5740fcdbad888d97f60fd1ae5f13245098d11c6b9552a221938c8b3b183146ffdf4c
diff --git a/x11-misc/arandr/arandr-0.1.7-r1.ebuild b/x11-misc/arandr/arandr-0.1.7.1.ebuild
similarity index 86%
rename from x11-misc/arandr/arandr-0.1.7-r1.ebuild
rename to x11-misc/arandr/arandr-0.1.7.1.ebuild
index 30b3f8c7d765..4e01f834378a 100644
--- a/x11-misc/arandr/arandr-0.1.7-r1.ebuild
+++ b/x11-misc/arandr/arandr-0.1.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/arandr-0.1.7-r1.ebuild,v 1.1 2013/03/03 00:25:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/arandr-0.1.7.1.ebuild,v 1.1 2013/03/04 18:32:17 hasufell Exp $
EAPI=5
@@ -22,8 +22,6 @@ RDEPEND=">=dev-python/pygtk-2[${PYTHON_USEDEP}]
DEPEND=">=dev-python/docutils-0.6[${PYTHON_USEDEP}]"
src_prepare() {
- epatch "${FILESDIR}"/${P}-locale.patch
-
local i p
# simulate gettext behavior:
# LINGUAS unset => install all
diff --git a/x11-misc/arandr/files/arandr-0.1.7-locale.patch b/x11-misc/arandr/files/arandr-0.1.7-locale.patch
deleted file mode 100644
index 9954f4ea7f57..000000000000
--- a/x11-misc/arandr/files/arandr-0.1.7-locale.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Julian Ospald
-Date: Sun Mar 3 00:09:56 UTC 2013
-Subject: build system
-
-don't error out when build/locale is non-existent
-
---- arandr-0.1.7/setup.py
-+++ arandr-0.1.7/setup.py
-@@ -120,12 +120,13 @@
-
- class install_data(_install_data):
- def run(self):
-- for lang in os.listdir('build/locale/'):
-- lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
-- lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'arandr.mo')
-- self.data_files.append((lang_dir, [lang_file]))
-+ if (os.path.exists('build/locale/')):
-+ for lang in os.listdir('build/locale/'):
-+ lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
-+ lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'arandr.mo')
-+ self.data_files.append((lang_dir, [lang_file]))
-
-- _install_data.run(self)
-+ _install_data.run(self)
-
- class sdist(_sdist):
- def run(self):
diff --git a/x11-misc/xclip/xclip-0.12.ebuild b/x11-misc/xclip/xclip-0.12.ebuild
index 3ae9fb103f83..a7a58cf05e55 100644
--- a/x11-misc/xclip/xclip-0.12.ebuild
+++ b/x11-misc/xclip/xclip-0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/xclip-0.12.ebuild,v 1.9 2013/01/15 22:09:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/xclip-0.12.ebuild,v 1.10 2013/03/04 10:40:53 vapier Exp $
DESCRIPTION="Command-line utility to read data from standard in and place it in an X selection"
HOMEPAGE="http://sourceforge.net/projects/xclip/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
index 1d4cf2cfe0e5..87d49ed2b092 100644
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r5.ebuild,v 1.10 2013/01/12 18:23:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r5.ebuild,v 1.11 2013/03/04 10:57:33 naota Exp $
EAPI=4
@@ -44,8 +44,10 @@ src_prepare(){
}
src_compile(){
+ PKG_CONFIG=$(tc-getPKG_CONFIG)
xmkmf -a || die
- emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \
+ emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS} $($PKG_CONFIG --libs ncurses)" \
XAPPLOADDIR="${EPREFIX}"/usr/share/X11/app-defaults
}
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index a82971e0d1f9..21f2561da6ef 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,2 +1,4 @@
DIST oxygen-gtk2-1.3.1.tar.bz2 193863 SHA256 50de5a24a1021fd1fb8c0ca73b9f7888224983f57c17e0db3a7a85f077ae418b SHA512 0ee536059ebf80d718f936ab03fb27acd556b3fb883f45a0da05fdac26c483558c8b453252aafa409d850e7a44e68109d4a9a58e6746ca1cc9f96ae5fedaa7ea WHIRLPOOL 4330b829029891e0689f7423211b4838b2daa88e938874d29bdf3730a0163dca8c18d30119b3ccdf3daa9b00c2d18cd838e27baf0b9d65c3e434f5b3977d0316
+DIST oxygen-gtk2-1.3.2.1.tar.bz2 194788 SHA256 11933d9c935ca14c6a455e52aa852f17cc33bec5a3ad7d53f2a76eae256c80a6 SHA512 c197addbfd7d2d0cd7e4895c32a74a1c055cd242346ede6837b73eca95938593ee1704ccb050957f8c50912816afdb0893954d8ef5e9517b9fdd5c8bfb019d33 WHIRLPOOL 49b4f39e7759a634f79fc7c2470449e31b270df9d0dac168be34c279ea53c1fc19e7a811825e4cc6d91693f9d39c85cfe21ff1c9ca236cf55db23b7b7d990232
DIST oxygen-gtk3-1.1.1.tar.bz2 187810 SHA256 faa9d27e623f8da17acfdf1fb8ba4254c81fb72c8fa449f14c23bef070fb960a SHA512 c7e5ade4aea3c3d09637e8adc15c1a8a3ade0cdb7c9eac4da7f986c9ce8ffbe49662b2decf39f80e1a1eac9e47597a833783da384b27bd42705fe63fd3262fce WHIRLPOOL c17a3d3cc56c8d8f61000b5501151879edbe7c2c1e6c576dea76f01c06ad9ce373516c62c8f3a3897bfa62fb62ea77dc127de5465a0b90e60527db5ef757ff70
+DIST oxygen-gtk3-1.1.2.tar.bz2 188030 SHA256 875f9bd75638cf1fbf8ce92d1756d60983d91b3597999373ffd9466e2a0bb7d0 SHA512 838f9edb5c0b501c4802dbd6220f830d6444b9fe9ca757ee4eca6b191ed9c31139ff61db513bbbde321e12fb09a6bf2f482f01da5996a77aabad5c93387a2a19 WHIRLPOOL e3fc03f4a26f69efa6c5f3b8c8130bfc3ec011d67a2d7375c56a04d917840a542bc0a65e5703ac8b1efb434c65e5d65d06b43e4e93fb2c651207f2406de5bdf4
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.1.2.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.1.2.ebuild
new file mode 100644
index 000000000000..f0d5a66c073a
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.1.2.ebuild,v 1.3 2013/03/04 16:29:26 kensington Exp $
+
+EAPI=5
+
+MY_PN=${PN}3
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils
+
+DESCRIPTION="Official GTK+:3 port of KDE's Oxygen widget style"
+HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="3"
+IUSE="debug doc"
+
+RDEPEND="
+ !x11-themes/oxygen-gtk:0
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( AUTHORS README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ if use doc; then
+ { cd "${S}" && doxygen Doxyfile; } || die "Generating documentation failed"
+ HTML_DOCS=( "${S}/doc/html/" )
+ fi
+
+ cmake-utils_src_install
+
+ cat <<-EOF > 99oxygen-gtk3
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-3.0"
+EOF
+ doenvd 99oxygen-gtk3
+}
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.3.2.1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.3.2.1.ebuild
new file mode 100644
index 000000000000..fa48c7263fc1
--- /dev/null
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.3.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/oxygen-gtk/oxygen-gtk-1.3.2.1.ebuild,v 1.1 2013/03/04 16:29:26 kensington Exp $
+
+EAPI=5
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils
+
+DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
+HOMEPAGE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="2"
+IUSE="debug doc"
+
+RDEPEND="
+ !x11-themes/oxygen-gtk:0
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24.2:2
+ x11-libs/libX11
+ x11-libs/pango
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( AUTHORS README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ if use doc; then
+ { cd "${S}" && doxygen Doxyfile; } || die "Generating documentation failed"
+ HTML_DOCS=( "${S}/doc/html/" )
+ fi
+
+ cmake-utils_src_install
+
+ cat <<-EOF > 99oxygen-gtk2
+CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
+EOF
+ doenvd 99oxygen-gtk2
+}
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index e15df54d6095..1c03481d60f9 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1 +1,2 @@
DIST xfce4-eyes-plugin-4.4.1.tar.bz2 324209 SHA256 eaae5d230b5c2fe6a8b448b59cfe959bf126796911c166a7343a51dc440fbbb2 SHA512 4a58609358be3cff417af3e74c40ce76048602e3e9eecf6c593cc1dd3a4cd75484ce3e11455a049df3949c16b8114c98eaeb962b6add1feccb5d46af2e0a3dab WHIRLPOOL 80d4e23fb26eefaf3b4a95cf1fad1ae10651fc3b60aa845c8bb340661f6536e44e0f4dd7fa754d13e5dcdef45a4652dacb2570370108545e63fec707dcf06084
+DIST xfce4-eyes-plugin-4.4.2.tar.bz2 308935 SHA256 dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021 SHA512 67e99da12829ae4724c7e57ed3d6825933c824157066dffc187380da80b3eef04756d1899c445f52b687ce8c1df3fff95a50ffc00af18d058c54d075bff6a33f WHIRLPOOL 07ff0c4f5cfa1ff304ca41a0cd6245fd65a924327d72d5b7c85a822dc479d2a779c40a283329e093772db635b976bafae949294ff18c48d4912da49215da544b
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.2.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.2.ebuild
new file mode 100644
index 000000000000..e416662303c5
--- /dev/null
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.2.ebuild,v 1.1 2013/03/04 18:39:57 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.20
+ >=x11-libs/gtk+-2.14:2
+ >=xfce-base/libxfce4ui-4.10
+ >=xfce-base/libxfce4util-4.10
+ >=xfce-base/xfce4-panel-4.10"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README )
+}