diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
new file mode 100644
index 000000000000..ee8aa23a2070
--- /dev/null
+++ b/app-admin/clustershell/Manifest
@@ -0,0 +1 @@
+DIST clustershell-1.6.tar.gz 950548 SHA256 ea119555ba9a4a8aa17d355345772263c20e2cc362140f55933ce217d7633e07 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02 WHIRLPOOL 889c250e6ef364dcab20960fb0fd84e6d8e00d8c185d40704b9a5845e4f45ea3fe074bdba5713aadb5cad04e11933b1d8a98fb7b80ec559682c699850c517975
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
new file mode 100644
index 000000000000..3867dd02ae48
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6.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/app-admin/clustershell/clustershell-1.6.ebuild,v 1.1 2013/02/05 14:10:48 hasufell Exp $
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="http://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+ distutils-r1_src_install
+
+ if use doc ; then
+ local i
+ for i in $(ls -I man "${S}"/doc) ; do
+ dodoc -r doc/${i}
+ done
+ fi
+
+ doman doc/man/man*/*
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+ einfo
+}
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
new file mode 100644
index 000000000000..bfabcd0164b9
--- /dev/null
+++ b/app-admin/clustershell/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ hasufell@gentoo.org
+ Julian Ospald
+
+
+
diff --git a/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
new file mode 100644
index 000000000000..eee7faf43b61
--- /dev/null
+++ b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
@@ -0,0 +1,47 @@
+--- gtkperf-0.40/work/gtkperf/configure.in
++++ gtkperf-0.40/work/gtkperf/configure.in
+@@ -8,7 +8,6 @@
+ AM_CONFIG_HEADER(config.h)
+
+ AC_ISC_POSIX
+-CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+--- gtkperf-0.40/work/gtkperf/src/timing.c
++++ gtkperf-0.40/work/gtkperf/src/timing.c
+@@ -97,7 +97,7 @@
+ gtk_text_buffer_insert (appdata->textview_info_buffer, &iter,
+ timestring, -1);
+
+- g_printf (timestring);
++ g_printf ("%s", timestring);
+
+ }
+
+@@ -129,7 +129,7 @@
+ gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ " Test Finished");
+
+- g_printf (timestring);
++ g_printf ("%s", timestring);
+
+ }
+
+@@ -154,5 +154,5 @@
+ gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ " Running tests...");
+
+- g_printf (timestring);
++ g_printf ("%s", timestring);
+ }
+--- gtkperf-0.40/work/gtkperf/src/main.c
++++ gtkperf-0.40/work/gtkperf/src/main.c
+@@ -5,6 +5,7 @@
+ #endif
+
+ #include
++#include
+
+ #ifdef HILDONIZED
+ #include
diff --git a/app-benchmarks/gtkperf/gtkperf-0.40.ebuild b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
similarity index 62%
rename from app-benchmarks/gtkperf/gtkperf-0.40.ebuild
rename to app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
index d9b25068d56a..6c274e96e2c1 100644
--- a/app-benchmarks/gtkperf/gtkperf-0.40.ebuild
+++ b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
@@ -1,8 +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-benchmarks/gtkperf/gtkperf-0.40.ebuild,v 1.4 2012/05/03 02:07:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild,v 1.1 2013/02/05 23:36:38 xmw Exp $
-EAPI="1"
+EAPI=5
+
+inherit eutils
MY_P="${PN}_${PV}"
DESCRIPTION="Application designed to test GTK+ performance"
@@ -19,15 +21,21 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
-src_compile() {
- econf "$(use_enable nls)"
- emake || die "emake failed"
+src_configure() {
+ econf $(use_enable nls)
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- rm -rf "${D}/usr/doc"
+ default
+
+ make_desktop_entry ${PN} ${PN} duck
+
+ rm -rf "${D}/usr/doc" || die
dodoc AUTHORS ChangeLog README TODO
}
diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml
index 1d5f99d169fe..d89f137c9768 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@@ -1,8 +1,5 @@
- wxwidgets
-
- wxwidgets@gentoo.org
-
+wxwidgets
diff --git a/app-emulation/wine/wine-1.5.23-r1.ebuild b/app-emulation/wine/wine-1.5.23-r1.ebuild
index 41ea5f36d07d..2ffbffca8869 100644
--- a/app-emulation/wine/wine-1.5.23-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.23-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/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.1 2013/02/04 02:38:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.2 2013/02/05 15:24:10 tetromino Exp $
EAPI="5"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml"
+IUSE="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 +win32 +win64 +X xcomposite xinerama xml"
[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
REQUIRED_USE="elibc_glibc? ( threads )
mono? ( || ( win32 !win64 ) )
@@ -69,7 +69,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
sys-apps/dbus
sys-fs/udisks:2
)
- gnutls? ( net-libs/gnutls:= )
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
x11-libs/libXcursor
@@ -99,7 +98,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
selinux? ( sec-policy/selinux-wine )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
- ssl? ( dev-libs/openssl:= )
+ ssl? (
+ dev-libs/openssl:=
+ net-libs/gnutls:= )
png? ( media-libs/libpng:= )
v4l? ( media-libs/libv4l )
!win64? ( ${MLIB_DEPS} )
@@ -185,7 +186,7 @@ do_configure() {
$(use_with ncurses curses) \
$(use_with udisks dbus) \
$(use_with fontconfig) \
- $(use_with gnutls) \
+ $(use_with ssl gnutls) \
$(use_with gphoto2 gphoto) \
$(use_with gsm) \
$(use_with gstreamer) \
diff --git a/app-emulation/wine/wine-1.5.23.ebuild b/app-emulation/wine/wine-1.5.23.ebuild
deleted file mode 100644
index 38d7542fe700..000000000000
--- a/app-emulation/wine/wine-1.5.23.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# 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.23.ebuild,v 1.1 2013/02/03 00:52:52 tetromino Exp $
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.9"
-MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.23"
-WINE_GENTOO="wine-gentoo-2012.11.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
- )
- mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
- http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
-REQUIRED_USE="elibc_glibc? ( threads )
- mono? ( || ( win32 !win64 ) )
- osmesa? ( opengl )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- odbc? ( app-emulation/emul-linux-x86-db )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=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
- )
- gnutls? ( net-libs/gnutls:= )
- 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:= )
- png? ( media-libs/libpng:= )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
- pulseaudio? (
- media-sound/pulseaudio
- sys-auth/rtkit
- )"
-DEPEND="${RDEPEND}
- 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"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if use win32 && use opencl; then
- [[ x$(eselect opencl show) = "xintel" ]] &&
- die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-
- unpack "${PULSE_PATCHES}.tar.bz2"
- unpack "${WINE_GENTOO}.tar.bz2"
-}
-
-src_prepare() {
- local md5="$(md5sum server/protocol.def)"
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
- epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
- [[ ${PV} == "9999" ]] || epatch "../${PULSE_PATCHES}"/*.patch #421365
- epatch_user #282735
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- eautoreconf
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- local usepulse
- [[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse)
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with udisks dbus) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with osmesa) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- ${usepulse} \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if use mono ; then
- insinto /usr/share/wine/mono
- doins "${DISTDIR}"/wine-mono-${MV}.msi
- fi
- if ! use perl ; then
- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-
- if use win32 || ! use win64; then
- pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
- fi
- use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
- if use win64 && ! use win32; then
- dosym /usr/bin/wine{64,} # 404331
- dosym /usr/bin/wine{64,}-preloader
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index fd02d5b7bfcf..c242d52f0ef3 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.131 2013/02/04 02:38:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.132 2013/02/05 15:24:10 tetromino Exp $
EAPI="5"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml"
+IUSE="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 +win32 +win64 +X xcomposite xinerama xml"
[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
REQUIRED_USE="elibc_glibc? ( threads )
mono? ( || ( win32 !win64 ) )
@@ -69,7 +69,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
sys-apps/dbus
sys-fs/udisks:2
)
- gnutls? ( net-libs/gnutls:= )
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
x11-libs/libXcursor
@@ -99,7 +98,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
selinux? ( sec-policy/selinux-wine )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
- ssl? ( dev-libs/openssl:= )
+ ssl? (
+ dev-libs/openssl:=
+ net-libs/gnutls:= )
png? ( media-libs/libpng:= )
v4l? ( media-libs/libv4l )
!win64? ( ${MLIB_DEPS} )
@@ -185,7 +186,7 @@ do_configure() {
$(use_with ncurses curses) \
$(use_with udisks dbus) \
$(use_with fontconfig) \
- $(use_with gnutls) \
+ $(use_with ssl gnutls) \
$(use_with gphoto2 gphoto) \
$(use_with gsm) \
$(use_with gstreamer) \
diff --git a/app-i18n/ibus-table/files/ibus-table-1.5.0-pycompile.patch b/app-i18n/ibus-table/files/ibus-table-1.5.0-pycompile.patch
new file mode 100644
index 000000000000..a492607eca27
--- /dev/null
+++ b/app-i18n/ibus-table/files/ibus-table-1.5.0-pycompile.patch
@@ -0,0 +1,13 @@
+diff --git a/engine/Makefile.in b/engine/Makefile.in
+index c9d1a42..4d25a09 100644
+--- a/engine/Makefile.in
++++ b/engine/Makefile.in
+@@ -418,7 +418,7 @@ install-engine_tablePYTHON: $(engine_table_PYTHON)
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(engine_tabledir)" || exit $$?; \
+ done || exit $$?; \
+ if test -n "$$dlist"; then \
+- $(am__py_compile) --destdir "$(DESTDIR)" \
++ $(py_compile) --destdir "$(DESTDIR)" \
+ --basedir "$(engine_tabledir)" $$dlist; \
+ else :; fi
+
diff --git a/app-office/pinpoint/metadata.xml b/app-office/pinpoint/metadata.xml
index d78147a16b2d..eda949feb073 100644
--- a/app-office/pinpoint/metadata.xml
+++ b/app-office/pinpoint/metadata.xml
@@ -1,10 +1,6 @@
-
- ford_prefect@gentoo.org
- Arun Raghavan
-
nirbheek@gentoo.org
Nirbheek Chauhan
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index ad715424095c..e2c8ec2dd9d8 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.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-portage/ufed/ufed-9999.ebuild,v 1.1 2012/11/20 18:22:58 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-9999.ebuild,v 1.2 2013/02/05 18:10:33 fuzzyray Exp $
EAPI=4
-inherit eutils multilib git-2 autotools prefix
+inherit eutils multilib git-2 autotools
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/ufed.git"
@@ -24,7 +24,6 @@ RDEPEND="${DEPEND}
src_prepare() {
# Change the version number to reflect the ebuild version
sed -i "s:,\[git\],:,\[9999-${EGIT_VERSION}\],:" configure.ac
- eprefixify ufed.8
eautoreconf
}
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 68591e6fc408..1949a677e564 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1 +1 @@
-DIST libmspub-0.0.3.tar.xz 339552 SHA256 e27c3021006080298357101a724563c23835c89757527217fb7f9357549ab15f SHA512 45dc27f8576ac65716b630fa0589b9e73efe78ae00dee5a5bad63becc00373ccc594480ed3d2a21ff06434c108c9120d47e16d8dfdd07198f99645bd31466ea1 WHIRLPOOL 3194a4b6ad0c57fd22c773a6188b8f87321fde11f80a08b86a2f2379da61d61947d541b3617b4526dcb868983002842d6e45565b3412984efb022f9994b1712b
+DIST libmspub-0.0.4.tar.xz 348468 SHA256 5a3f17fc62758b6ee1c80b364a18e14e58f69f645848902cf3cedfd3539ad5e7 SHA512 8ff014a48fe399425a36f926dcc2249a40aa65d9eb9749c06399f8a2ff790436389107ad421aed2be00e9a29438a763f445009f60a2cb427cf1217c110b9c7c3 WHIRLPOOL 243569b1175079457943dde7cdb9bb73159689907b2f5e4a3e7877f9b952322d851ed948fe2624e0cc655fe21b580f344c07fd7b7113106f6283f2943518ab67
diff --git a/app-text/libmspub/libmspub-0.0.3.ebuild b/app-text/libmspub/libmspub-0.0.4.ebuild
similarity index 92%
rename from app-text/libmspub/libmspub-0.0.3.ebuild
rename to app-text/libmspub/libmspub-0.0.4.ebuild
index a54b569f73fa..f05e768d8247 100644
--- a/app-text/libmspub/libmspub-0.0.3.ebuild
+++ b/app-text/libmspub/libmspub-0.0.4.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-0.0.3.ebuild,v 1.3 2013/01/12 13:16:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-0.0.4.ebuild,v 1.1 2013/02/05 14:03:52 scarabeus Exp $
-EAPI=4
+EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
[[ ${PV} == 9999 ]] && vcs="autotools git-2"
@@ -25,10 +25,12 @@ IUSE="doc static-libs"
RDEPEND="
app-text/libwpd:0.9
app-text/libwpg:0.2
+ dev-libs/icu:=
sys-libs/zlib
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-libs/boost
sys-devel/libtool
doc? ( app-doc/doxygen )
"
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index e0e3091f086b..06dbb2f90be2 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-9999.ebuild,v 1.2 2013/01/12 13:16:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-9999.ebuild,v 1.3 2013/02/05 14:03:52 scarabeus Exp $
-EAPI=4
+EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
[[ ${PV} == 9999 ]] && vcs="autotools git-2"
@@ -25,10 +25,12 @@ IUSE="doc static-libs"
RDEPEND="
app-text/libwpd:0.9
app-text/libwpg:0.2
+ dev-libs/icu:=
sys-libs/zlib
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-libs/boost
sys-devel/libtool
doc? ( app-doc/doxygen )
"
diff --git a/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch b/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch
new file mode 100644
index 000000000000..322968ebccf8
--- /dev/null
+++ b/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch
@@ -0,0 +1,62 @@
+From 5321959587ee0597703328213eb46716a3c0bb09 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev
+Date: Tue, 5 Feb 2013 22:18:01 -0500
+Subject: [PATCH] Use gawk, not awk
+
+Some other awk implementations (e.g. nawk) fail with a syntax error:
+
+awk: syntax error at source line 2
+ context is
+ >>> BEGIN <<< {
+---
+ tools/yelp-build.in | 4 ++--
+ tools/yelp-check.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/yelp-build.in b/tools/yelp-build.in
+index 1d70145..5058d6e 100755
+--- a/tools/yelp-build.in
++++ b/tools/yelp-build.in
+@@ -35,7 +35,7 @@ mkdir_p () {
+ }
+
+ urlencode () {
+- LANG=C awk '
++ LANG=C gawk '
+ BEGIN {
+ for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
+ }
+@@ -53,7 +53,7 @@ BEGIN {
+ }
+
+ urldecode () {
+- LANG=C awk '
++ LANG=C gawk '
+ BEGIN {
+ for(i = 0; i < 10; i++) hex[i] = i;
+ hex["A"] = hex["a"] = 10;
+diff --git a/tools/yelp-check.in b/tools/yelp-check.in
+index a258290..4961d67 100755
+--- a/tools/yelp-check.in
++++ b/tools/yelp-check.in
+@@ -30,7 +30,7 @@ urlencode () {
+ else
+ urlencode_slash='\/'
+ fi
+- echo "$1" | LANG=C awk '
++ echo "$1" | LANG=C gawk '
+ BEGIN {
+ for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
+ }
+@@ -48,7 +48,7 @@ BEGIN {
+ }
+
+ urldecode () {
+- echo "$1" | LANG=C awk '
++ echo "$1" | LANG=C gawk '
+ BEGIN {
+ for(i = 0; i < 10; i++) hex[i] = i;
+ hex["A"] = hex["a"] = 10;
+--
+1.8.1.2
+
diff --git a/app-text/yelp-tools/yelp-tools-3.4.1.ebuild b/app-text/yelp-tools/yelp-tools-3.4.1.ebuild
index 735ef588112f..4013876aa52f 100644
--- a/app-text/yelp-tools/yelp-tools-3.4.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.4.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/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.7 2012/12/19 15:54:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.8 2013/02/06 03:29:14 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -15,6 +15,7 @@ SLOT="0"
KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
IUSE=""
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
RDEPEND=">=dev-libs/libxml2-2.6.12
>=dev-libs/libxslt-1.1.8
dev-util/itstool
diff --git a/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild b/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..b8655fd54f16
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild,v 1.1 2013/02/06 03:29:14 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
+RDEPEND=">=dev-libs/libxml2-2.6.12
+ >=dev-libs/libxslt-1.1.8
+ dev-util/itstool
+ gnome-extra/yelp-xsl
+ sys-apps/gawk"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
+ default
+}
diff --git a/app-text/yelp-tools/yelp-tools-3.6.1.ebuild b/app-text/yelp-tools/yelp-tools-3.6.1.ebuild
index c6253bdc1427..c72cb0fcabe2 100644
--- a/app-text/yelp-tools/yelp-tools-3.6.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.6.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/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.9 2013/01/28 13:49:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.10 2013/02/06 03:29:14 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -15,6 +15,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE=""
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
RDEPEND=">=dev-libs/libxml2-2.6.12
>=dev-libs/libxslt-1.1.8
dev-util/itstool
diff --git a/dev-db/postgis/postgis-2.0.2-r1.ebuild b/dev-db/postgis/postgis-2.0.2-r1.ebuild
index b53316e84d80..77c12de91bee 100644
--- a/dev-db/postgis/postgis-2.0.2-r1.ebuild
+++ b/dev-db/postgis/postgis-2.0.2-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/dev-db/postgis/postgis-2.0.2-r1.ebuild,v 1.2 2013/02/04 14:55:54 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.2-r1.ebuild,v 1.3 2013/02/06 02:52:58 titanofold Exp $
EAPI="4"
@@ -51,6 +51,10 @@ RESTRICT="test"
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+# Because developers have been fooled into thinking recursive make is a
+# good thing.
+MAKEOPTS="-j1"
+
pkg_setup() {
export PGSLOT="$(postgresql-config show)"
@@ -80,12 +84,17 @@ src_compile() {
# Otherwise, it'd be fine.
emake
emake -C topology
- use doc && emake -C doc html -j1
+
+ if use doc ; then
+ emake comments
+ emake cheatsheets
+ emake -C doc html
+ fi
}
src_install() {
emake DESTDIR="${D}" install
- emake DESTDIR="${D}" comments-install
+ use doc && emake DESTDIR="${D}" comments-install
emake -C topology DESTDIR="${D}" install
dobin ./utils/postgis_restore.pl
diff --git a/dev-dotnet/google-gdata-sharp/google-gdata-sharp-1.4.0.2.ebuild b/dev-dotnet/google-gdata-sharp/google-gdata-sharp-1.4.0.2.ebuild
deleted file mode 100644
index 6038b2d7b18b..000000000000
--- a/dev-dotnet/google-gdata-sharp/google-gdata-sharp-1.4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/google-gdata-sharp/google-gdata-sharp-1.4.0.2.ebuild,v 1.4 2010/07/12 17:49:04 fauli Exp $
-
-EAPI=3
-
-inherit base mono
-
-MY_PN="libgoogle-data-mono"
-
-DESCRIPTION="C# bindings for the Google GData API"
-HOMEPAGE="http://code.google.com/p/google-gdata/"
-SRC_URI="http://google-gdata.googlecode.com/files/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# tests are completely broken (bug #310101), revisit in future bumps.
-RESTRICT="test"
-
-DEPEND=">=dev-lang/mono-2.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-# The Makefile has prefix=/usr/local by default :|
-MAKEOPTS="PREFIX=/usr ${MAKEOPTS}"
-
-src_prepare() {
- epatch "${FILESDIR}"/pkgconfig-typo-fix.patch
-}
diff --git a/dev-dotnet/google-gdata-sharp/metadata.xml b/dev-dotnet/google-gdata-sharp/metadata.xml
index 1b05edbdd325..73e8fe36697b 100644
--- a/dev-dotnet/google-gdata-sharp/metadata.xml
+++ b/dev-dotnet/google-gdata-sharp/metadata.xml
@@ -1,9 +1,7 @@
-
- ford_prefect@gentoo.org
-
+dotnet
google-gdata
diff --git a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
index 3b847501713d..46c148ae3340 100644
--- a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
+++ b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1-r1.ebuild,v 1.5 2009/09/23 16:40:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1-r1.ebuild,v 1.6 2013/02/05 23:23:15 vapier Exp $
+
+EAPI="4"
inherit eutils
@@ -8,27 +10,15 @@ DESCRIPTION="software package for working with JTAG-aware (IEEE 1149.1) hardware
HOMEPAGE="http://openwince.sourceforge.net/jtag/"
SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
-KEYWORDS="x86 sparc ~ppc"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc"
IUSE=""
-DEPEND="dev-embedded/include
- sys-apps/gawk
- sys-apps/grep
- sys-apps/sed
- sys-devel/gcc
- sys-devel/gettext"
-RDEPEND="!dev-embedded/urjtag
- dev-embedded/include"
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
- epatch ${FILESDIR}/${P}-no-erase-overshoot.diff
-}
+DEPEND="dev-embedded/include"
+RDEPEND="${DEPEND}
+ !dev-embedded/urjtag"
-src_install() {
- emake DESTDIR=${D} install || die "failed to install"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-erase-overshoot.diff
}
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 686cc0e9f04b..96218d9c4d1d 100644
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20050207-r1.ebuild,v 1.3 2007/10/20 20:58:26 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20050207-r1.ebuild,v 1.4 2013/02/05 23:30:47 vapier Exp $
+
+EAPI="4"
inherit eutils
@@ -13,26 +15,15 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
IUSE=""
-DEPEND="sys-apps/gawk
- sys-devel/gcc"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"/src
+src_prepare() {
+ sed -i -e "/^DOC_INST_DIR/s:/[^/]*$:/${PF}:" Makefile.in || die
+ cd src
epatch "${FILESDIR}"/mega-48-88-168.patch
- sed -i -e 's: -Werror::' Makefile.in
-}
-
-src_compile() {
- econf || die "configure failed"
- emake || die "make failed"
+ sed -i -e 's: -Werror::' Makefile.in || die
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
+ default
dodoc doc/*
- mv "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,CHANGES,TODO}* "${D}"/usr/share/doc/${PF}
- rm -rf "${D}"/usr/share/doc/${P}
- prepalldocs
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
}
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 140957051045..3405f8219bdc 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -1,5 +1,5 @@
DIST v8-3.14.5.3.tar.bz2 10352249 SHA256 f91d851abd284589272f2b338c74e10f07ce667736e8e73cbd301172cb7f75a1 SHA512 ea090f390d9ec86b33393135d9e14f2a059e0341f65aaa86e4816ee9b2f0d9dbdb1ef1d86b6eab5742c93f62279bb4ce806a86eeacc4e0e0b04b0627c462b685 WHIRLPOOL fbb44dfed7c77fac28eb4d87e9f151ab0e70d6e57807de0f6af3c71ec7006cee15cc2935f3c75375f8a793a92fcd6a9f453ba2ea4b7e0d7353f5f0382ca9d937
-DIST v8-3.15.11.11.tar.bz2 10396271 SHA256 cb4d9c57921d836cce84c21b0c17b6aaa6ec312f432ac48844f02a194dc7ad39 SHA512 fd0b0674708fca37cc3edbadba161b97b4758f1e3264afe287858d908342b6f830723a85434d58f17708fc242bbf26be188e0a375c4c49c74d8b62b0bdf656ba WHIRLPOOL e581f2ad020f1c034d34f45b75bed0a114cec641a955cc2c13ae547480a98ff091e773c555c18c4a4fbc53730b65c189a4c450d718260e111c4dd06f2534bdb3
DIST v8-3.15.11.13.tar.bz2 10390413 SHA256 7a9a0333c2faf081a4a950c9a3a2c599534e6b50eae17fd4a75ee0825e8c26ca SHA512 64b28f7a594d7b159d82ed0091b35bf845a49ab6a5d5a1d8c78f10548cbac2fc3f0c918e71002a63f42607b9e6a981455983ab9bd43dd55a7c8e0de0cdb3f7a2 WHIRLPOOL e8b36b66ea29a6c4dc9f09aa0caa04de31523491aa61c4325a5b05fa0de5585b6862ee2ad99ba074a99226d09039a854a57661d43d2cd675f40c5ad5a109fdc1
+DIST v8-3.15.11.15.tar.bz2 10396424 SHA256 b5064a3c9d27479532f2ad63182285fde5fe4fea0327715a60f8455f490603e0 SHA512 d24d83794ec41651f61c6d4df668100e64d8006478c2fb942a7df477356effef65edb0e8b71444bf0c3ba5b5ee95825bae845d80910c5e2ef81dee87f5449330 WHIRLPOOL 24b1b0daeda44a9ca0065617d3d3fffad35d510d2d3cc827d1aed7916356ef5d8e3b3ecc7e14f6e429fb3954c8eeeccc842ccd19bb607ea57e678673ad2efd31
DIST v8-3.16.11.1.tar.bz2 10421956 SHA256 d8d3fc8032ca841db581719996883fbc7118b8e183b6ec474c7c8e01cff728fa SHA512 0ba7c9b40ec5829decea6b1a057c81e48834992c839674b833fd53bb1da24d952727a3825d2154e5f0f5723ebd1504aa4dd468fbaad870ede2751364a1be4f6d WHIRLPOOL ba69f9190efbf2d1dc262dfdbfed95e26cc43ba58b1ff4a933fdba526a4d2326259d44542b1a3a6fb8b74dfdd997d85854084cd87c601f299259b16dfb312121
DIST v8-3.16.4.1.tar.bz2 10435189 SHA256 74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b SHA512 c0db5b0c101cfc2fb6d303c3fbfd021ee293e165fd3bf22b1d39ac510ac94d8f37dccdd67485880fd677c92cb0b0f51e591091abad8811dab2efb184445da6d9 WHIRLPOOL 2f2cf17b6b958c2ebf5aa9aa3f7865186374c6f23ae7123bfaaae07a92edfaf066b41a9db5465428e6ca1d21113d57ce8a2ab16fe38d0e7e5955b300747301dc
diff --git a/dev-lang/v8/v8-3.15.11.11.ebuild b/dev-lang/v8/v8-3.15.11.15.ebuild
similarity index 96%
rename from dev-lang/v8/v8-3.15.11.11.ebuild
rename to dev-lang/v8/v8-3.15.11.15.ebuild
index 032398f47bcb..b1da1d053c00 100644
--- a/dev-lang/v8/v8-3.15.11.11.ebuild
+++ b/dev-lang/v8/v8-3.15.11.15.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/v8/v8-3.15.11.11.ebuild,v 1.1 2013/01/24 02:41:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.15.11.15.ebuild,v 1.1 2013/02/06 02:30:42 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
diff --git a/dev-libs/hiredis/files/hiredis-0.11.0-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-0.11.0-disable-network-tests.patch
index e53a33ca9a28..a67503861c24 100644
--- a/dev-libs/hiredis/files/hiredis-0.11.0-disable-network-tests.patch
+++ b/dev-libs/hiredis/files/hiredis-0.11.0-disable-network-tests.patch
@@ -1,7 +1,21 @@
-diff -uNr hiredis-0.11.0.orig/test.c hiredis-0.11.0/test.c
---- hiredis-0.11.0.orig/test.c 2013-01-14 10:16:25.000000000 -0500
-+++ hiredis-0.11.0/test.c 2013-01-14 10:18:05.000000000 -0500
-@@ -634,6 +634,7 @@
+--- test.c.orig 2013-02-05 10:45:22.000000000 -0500
++++ test.c 2013-02-05 10:43:19.000000000 -0500
+@@ -282,12 +282,14 @@
+ static void test_blocking_connection_errors(void) {
+ redisContext *c;
+
++ /*
+ test("Returns error when host cannot be resolved: ");
+ c = redisConnect((char*)"idontexist.local", 6379);
+ test_cond(c->err == REDIS_ERR_OTHER &&
+ (strcmp(c->errstr,"Name or service not known") == 0 ||
+ strcmp(c->errstr,"Can't resolve: idontexist.local") == 0));
+ redisFree(c);
++ */
+
+ test("Returns error when the port is not open: ");
+ c = redisConnect((char*)"localhost", 1);
+@@ -634,6 +636,7 @@
test_reply_reader();
test_blocking_connection_errors();
@@ -9,7 +23,7 @@ diff -uNr hiredis-0.11.0.orig/test.c hiredis-0.11.0/test.c
printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
cfg.type = CONN_TCP;
test_blocking_connection(cfg);
-@@ -645,6 +646,7 @@
+@@ -645,6 +648,7 @@
test_blocking_connection(cfg);
test_blocking_io_errors(cfg);
if (throughput) test_throughput(cfg);
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5fe5bdeb03fe..0aa7e1716dc5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -2,10 +2,12 @@ DIST openssl-0.9.8u.tar.gz 3781776 SHA256 0548e4b9171a62dcbbe85e63d9b897a35de718
DIST openssl-0.9.8v.tar.gz 3782207 SHA256 701ac4dbd27b9237919b214b53bc0d08e5e1448f2d0fbe1c80479293d2379a65 SHA512 5e625c69b6176bbb4acd0c4b5751d694591156f672e79fecd72c2a7e782e27cb67f0bfe2aea662b2e81f2f4c71ce9805bb5b8da023b368f35952b052e04520f9 WHIRLPOOL 66ea39d7f67259bf17f614de17e76c4c01e910aece24a3f9b107c7f0119809c8b86e098e92639d7c94417e45bc80c670cc3838520743b5ccc632905d1140d66f
DIST openssl-0.9.8w.tar.gz 3782900 SHA256 537411fe2cfe249a8a5b98b3f809a07ed5f913b94a216b3c510fd353318e4593 SHA512 3d93c96ec5550ae6936b353aa48081b9d8a4adfbd5a51d58b44916961e56fb9aedd30621a99ca3618aa3c6b3e15f30a10457d98629ef6ee0c6cb5518606981ca WHIRLPOOL 0ebc673d02489be248b62f800a99d714b7751702fcb7050f40c2231b318aeb3c868cdd48abc9dcecd018139c30b6e23764d0525bafde17097699e9767a3534dd
DIST openssl-0.9.8x.tar.gz 3782486 SHA256 7ce0c7f2c451070b4497ea7ca6f23eba6cef1a56db2e86e433f65926a7bc7497 SHA512 195ba38e5a3ecb9ea65ed1c0dfd7a7c7c8d25683cb401a4c68880a58b0dc3f3002186381ab1ddac64cc441ecd86606aa14bb91ecfc0c56b31ba85015589afdb2 WHIRLPOOL c54f046600443e16dcb41ef1bbb8a803f701f3af4b2a2011419fb1528838f412dc003155a3fbf5e0d15c64c64c3368e628e145cfc90671a0c2b333ac3a4c2ff9
+DIST openssl-0.9.8y.tar.gz 3785001 SHA256 bbecf13495e612936e3a9860c29c0701413564b7a964bf771a3575eaa867cee3 SHA512 cdc05067343d6b06a0d0278e90abcea9bf58439c98279ce0ce22673bf6f4a6597babcb276635c3b15cf04ec76cf53320236f5b6bbc46544a61280825f5b7b3cc WHIRLPOOL c8c9cb00f303c2d95a1d2000c74bb146fb069da9471093bf7a2c00db2a5955c2d63908b3314eb9cd12ea1e80c3bac143d3774bc27515f2ab03c5ef4d88b61612
DIST openssl-1.0.0h.tar.gz 4048067 SHA256 7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d SHA512 6a1129fa4c90ed67cdeec5578f72ee74ceb983877bbbac41b6ace4abcf4154d6b8217d11951296a1fdfade82c7b9e59e7994fca94e7eb78026b2980fec7be9c5 WHIRLPOOL edec087ef7bf3b6300c2b5870471eca793a0cba217f1ae728d808757749bdc1bdc193c21d86ecf9ba47ca4d0e6bebd1d6407654637226b6dece68b75b8295bc5
DIST openssl-1.0.0i.tar.gz 4047721 SHA256 548262d15777c504be1ab9bb8fabef1e14a3de54837a6593c8f403dd843d5e57 SHA512 b35d64c038f913fcec8cdec5f8a801425dd4bafb1472548a8c13cbce2245aabfc0ca416e166ac6063d59375817f6560390079156db41b98a83db44307ac0cecb WHIRLPOOL a0854284830ec7e7e2c4418423d089f91a0f81bc7313dd1d1791b20d4b78bfc7543834baad2e8817a3809eb8db10079ee1e84f40ef5003ff9330ad49adf142b8
DIST openssl-1.0.0j.tar.gz 4047852 SHA256 626fb8fcb3eb7e966edbe71553ff993d137f6e8a87b05051a3695e621098b8af SHA512 9796c75b4d5de57928708f5f0a8ca01aff5b4974b60006454657ed54c34998bc54d747af03860d319db7e7a57b0cd3c267758ffaac31be2be045c977d5fc33d4 WHIRLPOOL 239f051930d9562e7266edd69cf3a1060d381a95228fd17813dd2dbf469c2cf066786b277c2fd56973b830a6b43f28934f5f15d3b6dfac8f37a6e6a65fcae455
DIST openssl-1.0.1a.tar.gz 4456456 SHA256 d3487e09d891c772cf946273a3bb0ca47479e7941be6d822274320e7cfcc361b SHA512 ceebecbe60201ebb2c600f97e4e0ed38638789189dc2fae85997d5903eda7884ad6190e21b75c453c28ab36ab9262c30f2732945e78bcecc3090542dd4dafd02 WHIRLPOOL 8448ef79710410a2f2b8a7b7b80798c032273d39a3c3f5c1389a1c45a24dd63a3a5a6ce8902a6d0669f0f2643cd5321e969417d01e5194283a159d1773896a50
DIST openssl-1.0.1b.tar.gz 4456651 SHA256 1187bf2d5cdf0b286b951bf5c777aa97855cd7db24fdb9604cb557c8b1d7364b SHA512 d0cfec093b1a27a14ee6d6dc5da0c19c14b77edf8ba558e909be7cf8c5e29023061ed7ac3c54ffe08ea0c21bb859781c63257e26423a66a117c5887bc65051d2 WHIRLPOOL 552d99cdecba10f208933d5fd2055125769c67576af76c8a50f0d33a4d64cc3165913cddcf5e9a1bed0dec51efbd055beaa8bfdcb079fb8337b22534da741540
DIST openssl-1.0.1c.tar.gz 4457113 SHA256 2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe SHA512 14f766daab0828a2f07c65d6da8469a4a5a2b839ff3da188538c4e2db3e3e2f37217fb37e269617fb438463b75fb77dab0b155f36831ff48edbc9e7f2903ebd3 WHIRLPOOL 15f90cd981ed82cb1891a2e4179a15882f34aa0ecfff7e6a4fa435b9ea021168228504e7cd9e201c8ada1207942784558f2696f5d45293fa876cf143d8826bf7
+DIST openssl-1.0.1d.tar.gz 4459791 SHA256 88a423f9b08a994054583691b968815875580e12df754e881d7cfe9f1bd1f49d SHA512 333c915501cc4998ab1d16251790eeb471ee6cbf30afcba9b7eefd3cec6a50e061b4347e60b751fa4afea15700ef629503931f22cec3ed64723ac3372ca7735e WHIRLPOOL c7045355d2df7cffe69c24002aa4a17bca76454ab9829741b6d54e74367e9e32dbe7c68b0da8cab2e2a4107b4fe9f93fdcea3c4c0d770fd8c6edebc5a9cc64cc
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
diff --git a/dev-libs/openssl/openssl-0.9.8y.ebuild b/dev-libs/openssl/openssl-0.9.8y.ebuild
new file mode 100644
index 000000000000..f06fb1b7f3a1
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8y.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8y.ebuild,v 1.1 2013/02/06 00:02:46 vapier Exp $
+
+# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0.9.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos sse2 test zlib"
+
+RDEPEND="gmp? ( dev-libs/gmp )
+ zlib? ( sys-libs/zlib )
+ kerberos? ( app-crypt/mit-krb5 )
+ !=dev-libs/openssl-0.9.8*:0"
+DEPEND="${RDEPEND}
+ sys-apps/diffutils
+ >=dev-lang/perl-5
+ test? ( sys-devel/bc )"
+
+pkg_setup() {
+ # avoid collisions with openssl-1 (preserve lib)
+ if ! has_version dev-libs/openssl:${SLOT} ; then
+ ewarn "Removing lib{crypto,ssl}.so.0.9.8 to avoid collision with openssl-1"
+ rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
+ epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
+ epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
+
+ # disable fips in the build
+ # make sure the man pages are suffixed #302165
+ # don't bother building man pages if they're disabled
+ sed -i \
+ -e '/DIRS/s: fips : :g' \
+ -e '/^MANSUFFIX/s:=.*:=ssl:' \
+ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+ -e $(has noman FEATURES \
+ && echo '/^install:/s:install_docs::' \
+ || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+ Makefile{,.org} \
+ || die
+ # show the actual commands in the log
+ sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+ # update the enginedir path.
+ # punt broken config we don't care about as it fails sanity check.
+ sed -i \
+ -e '/^"debug-ben-debug-64"/d' \
+ -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
+ Configure || die
+
+ # allow openssl to be cross-compiled
+ cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
+ chmod a+rx gentoo.config
+
+ append-flags -fno-strict-aliasing
+ append-flags -Wa,--noexecstack
+
+ sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+ sed -i '/^"debug-steve/d' Configure # 0.9.8k shipped broken
+ ./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+ unset APPS #197996
+ unset SCRIPTS #312551
+
+ tc-export CC AR RANLIB
+
+ # Clean out patent-or-otherwise-encumbered code
+ # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
+ # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+ # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+ # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
+ # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
+
+ use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
+ echoit() { echo "$@" ; "$@" ; }
+
+ local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+ local sslout=$(./gentoo.config)
+ einfo "Use configuration ${sslout:-(openssl knows best)}"
+ local config="Configure"
+ [[ -z ${sslout} ]] && config="config"
+ echoit \
+ ./${config} \
+ ${sslout} \
+ $(use sse2 || echo "no-sse2") \
+ enable-camellia \
+ $(use_ssl !bindist ec) \
+ enable-idea \
+ enable-mdc2 \
+ $(use_ssl !bindist rc5) \
+ enable-tlsext \
+ $(use_ssl gmp gmp -lgmp) \
+ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+ $(use_ssl zlib) \
+ --prefix=/usr \
+ --openssldir=/etc/ssl \
+ shared threads \
+ || die "Configure failed"
+
+ # Clean out hardcoded flags that openssl uses
+ local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+ -e 's:^CFLAG=::' \
+ -e 's:-fomit-frame-pointer ::g' \
+ -e 's:-O[0-9] ::g' \
+ -e 's:-march=[-a-z0-9]* ::g' \
+ -e 's:-mcpu=[-a-z0-9]* ::g' \
+ -e 's:-m[a-z0-9]* ::g' \
+ )
+ sed -i \
+ -e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
+ -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+ -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+ Makefile || die
+}
+
+src_compile() {
+ # depend is needed to use $confopts
+ emake -j1 depend || die "depend failed"
+ emake -j1 build_libs || die "make build_libs failed"
+}
+
+src_test() {
+ emake -j1 test || die "make test failed"
+}
+
+src_install() {
+ dolib.so lib{crypto,ssl}.so.0.9.8 || die
+}
diff --git a/dev-libs/openssl/openssl-1.0.1d.ebuild b/dev-libs/openssl/openssl-1.0.1d.ebuild
new file mode 100644
index 000000000000..65c4604aabf9
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.1d.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1d.ebuild,v 1.1 2013/02/06 00:02:46 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+ http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
+ zlib? ( sys-libs/zlib[static-libs(+)] )
+ kerberos? ( app-crypt/mit-krb5 )"
+# The blocks are temporary just to make sure people upgrade to a
+# version that lack runtime version checking. We'll drop them in
+# the future.
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+ !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ !=dev-lang/perl-5
+ test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ SSL_CNF_DIR="/etc/ssl"
+ sed \
+ -e "/^DIR=/s:=.*:=${SSL_CNF_DIR}:" \
+ "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
+ > "${WORKDIR}"/c_rehash || die #416717
+}
+
+src_prepare() {
+ # Make sure we only ever touch Makefile.org and avoid patching a file
+ # that gets blown away anyways by the Configure script in src_configure
+ rm -f Makefile
+
+ if ! use vanilla ; then
+ epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+ epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+ epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+ epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
+ epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
+ epatch "${FILESDIR}"/${PN}-1.0.1-ipv6.patch
+ epatch_user #332661
+ fi
+
+ # disable fips in the build
+ # make sure the man pages are suffixed #302165
+ # don't bother building man pages if they're disabled
+ sed -i \
+ -e '/DIRS/s: fips : :g' \
+ -e '/^MANSUFFIX/s:=.*:=ssl:' \
+ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+ -e $(has noman FEATURES \
+ && echo '/^install:/s:install_docs::' \
+ || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+ Makefile.org \
+ || die
+ # show the actual commands in the log
+ sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+ # allow openssl to be cross-compiled
+ cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
+ chmod a+rx gentoo.config
+
+ append-flags -fno-strict-aliasing
+ append-flags $(test-flags-CC -Wa,--noexecstack)
+
+ sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+ ./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+ unset APPS #197996
+ unset SCRIPTS #312551
+ unset CROSS_COMPILE #311473
+
+ tc-export CC AR RANLIB RC
+
+ # Clean out patent-or-otherwise-encumbered code
+ # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
+ # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+ # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+ # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
+ # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
+
+ use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+ echoit() { echo "$@" ; "$@" ; }
+
+ local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+ local sslout=$(./gentoo.config)
+ einfo "Use configuration ${sslout:-(openssl knows best)}"
+ local config="Configure"
+ [[ -z ${sslout} ]] && config="config"
+ echoit \
+ ./${config} \
+ ${sslout} \
+ $(use sse2 || echo "no-sse2") \
+ enable-camellia \
+ $(use_ssl !bindist ec) \
+ enable-idea \
+ enable-mdc2 \
+ $(use_ssl !bindist rc5) \
+ enable-tlsext \
+ $(use_ssl gmp gmp -lgmp) \
+ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+ $(use_ssl rfc3779) \
+ $(use_ssl zlib) \
+ --prefix=/usr \
+ --openssldir=${SSL_CNF_DIR} \
+ --libdir=$(get_libdir) \
+ shared threads \
+ || die
+
+ # Clean out hardcoded flags that openssl uses
+ local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+ -e 's:^CFLAG=::' \
+ -e 's:-fomit-frame-pointer ::g' \
+ -e 's:-O[0-9] ::g' \
+ -e 's:-march=[-a-z0-9]* ::g' \
+ -e 's:-mcpu=[-a-z0-9]* ::g' \
+ -e 's:-m[a-z0-9]* ::g' \
+ )
+ sed -i \
+ -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+ -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+ Makefile || die
+}
+
+src_compile() {
+ # depend is needed to use $confopts; it also doesn't matter
+ # that it's -j1 as the code itself serializes subdirs
+ emake -j1 depend
+ emake all
+ # rehash is needed to prep the certs/ dir; do this
+ # separately to avoid parallel build issues.
+ emake rehash
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ emake INSTALL_PREFIX="${D}" install
+ dobin "${WORKDIR}"/c_rehash #333117
+ dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+ dohtml -r doc/*
+ use rfc3779 && dodoc engines/ccgost/README.gost
+
+ # This is crappy in that the static archives are still built even
+ # when USE=static-libs. But this is due to a failing in the openssl
+ # build system: the static archives are built as PIC all the time.
+ # Only way around this would be to manually configure+compile openssl
+ # twice; once with shared lib support enabled and once without.
+ use static-libs || rm -f "${D}"/usr/lib*/lib*.a
+
+ # create the certs directory
+ dodir ${SSL_CNF_DIR}/certs
+ cp -RP certs/* "${D}"${SSL_CNF_DIR}/certs/ || die
+ rm -r "${D}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+ # Namespace openssl programs to prevent conflicts with other man pages
+ cd "${D}"/usr/share/man
+ local m d s
+ for m in $(find . -type f | xargs grep -L '#include') ; do
+ d=${m%/*} ; d=${d#./} ; m=${m##*/}
+ [[ ${m} == openssl.1* ]] && continue
+ [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+ mv ${d}/{,ssl-}${m}
+ # fix up references to renamed man pages
+ sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+ ln -s ssl-${m} ${d}/openssl-${m}
+ # locate any symlinks that point to this man page ... we assume
+ # that any broken links are due to the above renaming
+ for s in $(find -L ${d} -type l) ; do
+ s=${s##*/}
+ rm -f ${d}/${s}
+ ln -s ssl-${m} ${d}/ssl-${s}
+ ln -s ssl-${s} ${d}/openssl-${s}
+ done
+ done
+ [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+ dodir /etc/sandbox.d #254521
+ echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+
+ diropts -m0700
+ keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+ has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+ preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+ ebegin "Running 'c_rehash ${ROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+ c_rehash "${ROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+ eend $?
+
+ has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+ preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
diff --git a/dev-python/aplpy/Manifest b/dev-python/aplpy/Manifest
index 57172b235a69..dcf8d9d62149 100644
--- a/dev-python/aplpy/Manifest
+++ b/dev-python/aplpy/Manifest
@@ -1,2 +1 @@
-DIST APLpy-0.9.7.tar.gz 55747 SHA256 53d30083a6e9854c4afbf13b050feee2b4ebd2f7b36d22e39e7d7c663e7986da SHA512 7d101c963ff5e05821818d98e8a1ac5e0b8c7cf4335a4be4140e4eae57d408e47701636c067e88af81b10b0460ef9c0e14f7458fbfd683ce4628c3f92c5c69f8 WHIRLPOOL 1fb6b2ef9bac13582faf69949856113747dfb15ed302958753fccc52244ed946c856e222803c885a840b17b694f5492bd768e3b7abac1e94c5a8e96363ef8de8
DIST APLpy-0.9.8.tar.gz 204013 SHA256 c8841815adf8e4a747a207db47452fc071bd1b010a53a0f490029c42a9e48264 SHA512 0a71109f27d7744d5257b5454701b4adc0b129059d28c199fd30f5b94e77348485a1a449de357a00298ff1fcf85ab631ad285904513ba831703a00e3519b472b WHIRLPOOL 093cad9598f4e1382b0be15199e1e2c5ecfe30084ecd210b14c79a78a58b8df4556297c649eaba36975f57c369eb42a5ccb76216c8f7e9c3d542999e9f17ef18
diff --git a/dev-python/aplpy/aplpy-0.9.7.ebuild b/dev-python/aplpy/aplpy-0.9.7.ebuild
deleted file mode 100644
index 18bb86486eb5..000000000000
--- a/dev-python/aplpy/aplpy-0.9.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.7.ebuild,v 1.2 2012/04/23 20:06:28 mgorny Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MYP=APLpy-${PV}
-
-DESCRIPTION="Astronomical Plotting Library in Python"
-HOMEPAGE="http://aplpy.github.com/ http://pypi.python.org/pypi/APLpy"
-SRC_URI="mirror://github/${PN}/${PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/numpy"
-RDEPEND="${DEPEND}
- dev-python/matplotlib
- dev-python/pyfits
- dev-python/pywcs"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-S=${WORKDIR}/${MYP}
diff --git a/dev-python/aplpy/aplpy-0.9.8-r1.ebuild b/dev-python/aplpy/aplpy-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..797b6df340dd
--- /dev/null
+++ b/dev-python/aplpy/aplpy-0.9.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.8-r1.ebuild,v 1.1 2013/02/05 22:42:52 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+MYP=APLpy-${PV}
+
+DESCRIPTION="Astronomical Plotting Library in Python"
+HOMEPAGE="http://aplpy.github.com/"
+SRC_URI="mirror://github/${PN}/${PN}/${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/numpy
+ dev-python/matplotlib
+ dev-python/pyfits
+ dev-python/pywcs"
+DEPEND="
+ dev-python/numpy
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+ PYTHONPATH="${BUILD_DIR}"/lib "${EPYTHON}" runtests.py || die
+}
diff --git a/dev-python/aplpy/metadata.xml b/dev-python/aplpy/metadata.xml
index 43f61495ed19..9f00245ca4e2 100644
--- a/dev-python/aplpy/metadata.xml
+++ b/dev-python/aplpy/metadata.xml
@@ -9,4 +9,7 @@
capable of creating output files in several graphical formats,
including EPS, PDF, PS, PNG, and SVG.
+
+ APLpy
+
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 6083a26657ce..a46b8c3e2f6e 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -2,3 +2,4 @@ DIST apsw-3.7.13-r1.zip 632647 SHA256 5f26b670069b1bde2635a219db2314c674bb7d7d9f
DIST apsw-3.7.14-r1.zip 676597 SHA256 2ad5f46e68eb056257abe164a3615297355c3eca482dc7f9c8434450c8f73314 SHA512 e4a6615ae407abacc003a5369fcbe912fedeb250f915c076a5165775f2141c2265d02b175730db9f6d808d5bbff9c355b2097bb3afadfeec575cd8771a29df8f WHIRLPOOL 16fc0bdf0b81aa0567055889ab1dbc5e01d293362d65735d1e752f16edf3171cd8728f529e2d2682393bb2c2d3135853c09825ed922d40eadc2982ad5296a434
DIST apsw-3.7.14.1-r1.zip 678959 SHA256 690277428925231057382150a6073c2bea8026d463b0b9bf25f2655ab802c6be SHA512 7ec1cf295e7f593bf6e1d79bde9b18e0398199b0505a25d8f88ed33932626207a9805949e9f55ad01691100c2aff0cd1f17a73d30e8be41ee896c37999cfac1e WHIRLPOOL f34105430522d301f62bc5943b6b3a3ade1314d16783aa5010f4e1b81f9541255e96a71526f076b2bbb08850955ddf7e5d72ed9cf599bb2d87f30b06d0f95fde
DIST apsw-3.7.15.1-r1.zip 679379 SHA256 148a1c2059457ed3c09c926a5daa2b70330b00e7036077cbb7b4f6fbf428f6da SHA512 a32c4a60177a31886baba6e236aa9cef42a8952fc0b55f8524a8c5e73cd8e8be6f558cce5f45731f9392337a2d5d7227c186d6e55fa8c91b1bf458effb64fd1f WHIRLPOOL 63a77aa8772554815ef49805e9b4a57dbb0655e91df2906d9d8de8e09b5ad7764d4a99d22db2ac1101a7ea518af265fdc1406142fa1520f4aac8823d8bd1b88e
+DIST apsw-3.7.15.2-r1.zip 679611 SHA256 2c0e66506aa8f0101252a3768c0592735f6b87876098774db6acfdbe32394855 SHA512 edb4b32486c3e072916475da4698142b859e93699beb217a5df0689e3ebde461a2e4a8c56fe3b1761f6c81d548e79e537edf809712528ae1277cead8c3050708 WHIRLPOOL e75f216fda2166d598149a99c1218ea7fc6aeef6c5aef7cc8f4cdb5fe6e322eb9b817c36f528fb639361518efa343f9007ffb9f2835f1d7f65acdfa2d18b0833
diff --git a/dev-python/apsw/apsw-3.7.15.2_p1.ebuild b/dev-python/apsw/apsw-3.7.15.2_p1.ebuild
new file mode 100644
index 000000000000..bd3f4eecef60
--- /dev/null
+++ b/dev-python/apsw/apsw-3.7.15.2_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.15.2_p1.ebuild,v 1.1 2013/02/06 01:24:43 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+MY_P=${PN}-${PV/_p/-r}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="http://code.google.com/p/apsw/"
+SRC_URI="http://apsw.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}[extensions]"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
+
+python_compile() {
+ if [[ ${EPYTHON} == python2* ]]; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+ distutils-r1_python_compile --enable=load_extension
+}
+
+src_test() {
+ # tests use overlapping database files
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+ distutils-r1_src_test
+}
+
+python_test() {
+ "${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+ "${PYTHON}" tests.py -v || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use doc ; then
+ dohtml -r doc/*
+ fi
+}
diff --git a/dev-python/docutils/docutils-0.9.1-r1.ebuild b/dev-python/docutils/docutils-0.9.1-r1.ebuild
index 9028aba6a703..385cc697d6c4 100644
--- a/dev-python/docutils/docutils-0.9.1-r1.ebuild
+++ b/dev-python/docutils/docutils-0.9.1-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/dev-python/docutils/docutils-0.9.1-r1.ebuild,v 1.5 2013/01/13 17:34:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1-r1.ebuild,v 1.7 2013/02/05 20:20:57 ago Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy1_9 )
@@ -14,7 +14,7 @@ SRC_URI+=" glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
LICENSE="BSD-2 GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="glep"
RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent/gevent-1.0_beta2-r1.ebuild b/dev-python/gevent/gevent-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..632f182a36da
--- /dev/null
+++ b/dev-python/gevent/gevent-1.0_beta2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent/gevent-1.0_beta2-r1.ebuild,v 1.1 2013/02/05 23:40:02 mgorny Exp $
+
+EAPI=5
+
+# py2.5 needs http://pypi.python.org/pypi/ssl
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python networking library that uses greenlet to provide synchronous API"
+HOMEPAGE="http://code.google.com/p/gevent/ http://pypi.python.org/pypi/gevent/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libev
+ net-dns/c-ares
+ dev-python/greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+ rm -rf {libev,c-ares}
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ cd greentest || die
+ "${PYTHON}" testrunner.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+
+ dodoc changelog.rst
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/pycurl/files/pycurl-7.19.0-python3.patch b/dev-python/pycurl/files/pycurl-7.19.0-python3.patch
new file mode 100644
index 000000000000..102cbc75fd72
--- /dev/null
+++ b/dev-python/pycurl/files/pycurl-7.19.0-python3.patch
@@ -0,0 +1,1254 @@
+Add support for Python 3.
+Based on patch from ubuntu.
+Modifed to work with Python 2.5 by Mike Gilbert (floppym).
+
+Description: Add support for Python 3
+Origin: http://sourceforge.net/tracker/?func=detail&aid=3188495&group_id=28236&atid=392779
+Author: Markus Koetter
+Author: Michael Terry
+
+diff --git a/examples/basicfirst.py b/examples/basicfirst.py
+index 4e49465..6b658fc 100644
+--- a/examples/basicfirst.py
++++ b/examples/basicfirst.py
+@@ -13,13 +13,17 @@ class Test:
+ def body_callback(self, buf):
+ self.contents = self.contents + buf
+
+-print >>sys.stderr, 'Testing', pycurl.version
++print('Testing', pycurl.version, file=sys.stderr)
+
+-t = Test()
+-c = pycurl.Curl()
+-c.setopt(c.URL, 'http://curl.haxx.se/dev/')
+-c.setopt(c.WRITEFUNCTION, t.body_callback)
+-c.perform()
+-c.close()
++try:
++ t = Test()
++ c = pycurl.Curl()
++ c.setopt(c.URL, sys.argv[1])
++ c.setopt(c.WRITEFUNCTION, t.body_callback)
++ c.perform()
++ c.close()
++# print(t)
++ print(t.contents)
++except Exception as e:
++ print(e)
+
+-print t.contents
+diff --git a/examples/retriever-multi.py b/examples/retriever-multi.py
+index 0b4b417..fbf7515 100644
+--- a/examples/retriever-multi.py
++++ b/examples/retriever-multi.py
+@@ -10,6 +10,7 @@
+
+ import sys
+ import pycurl
++import time
+
+ # We should ignore SIGPIPE when using pycurl.NOSIGNAL - see
+ # the libcurl tutorial for more info.
+@@ -31,7 +32,7 @@ try:
+ if len(sys.argv) >= 3:
+ num_conn = int(sys.argv[2])
+ except:
+- print "Usage: %s [<# of concurrent connections>]" % sys.argv[0]
++ print("Usage: %s [<# of concurrent connections>]" % sys.argv[0])
+ raise SystemExit
+
+
+@@ -50,8 +51,8 @@ assert queue, "no URLs given"
+ num_urls = len(queue)
+ num_conn = min(num_conn, num_urls)
+ assert 1 <= num_conn <= 10000, "invalid number of concurrent connections"
+-print "PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM)
+-print "----- Getting", num_urls, "URLs using", num_conn, "connections -----"
++print("PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM))
++print("----- Getting", num_urls, "URLs using", num_conn, "connections -----")
+
+
+ # Pre-allocate a list of curl objects
+@@ -79,6 +80,9 @@ while num_processed < num_urls:
+ c.fp = open(filename, "wb")
+ c.setopt(pycurl.URL, url)
+ c.setopt(pycurl.WRITEDATA, c.fp)
++# print(c.fp)
++# c.fp.close()
++# c.fp = None
+ m.add_handle(c)
+ # store some info
+ c.filename = filename
+@@ -92,16 +96,17 @@ while num_processed < num_urls:
+ while 1:
+ num_q, ok_list, err_list = m.info_read()
+ for c in ok_list:
++ c.fp.flush()
+ c.fp.close()
+ c.fp = None
+ m.remove_handle(c)
+- print "Success:", c.filename, c.url, c.getinfo(pycurl.EFFECTIVE_URL)
++ print("Success:", c.filename, c.url, c.getinfo(pycurl.EFFECTIVE_URL))
+ freelist.append(c)
+ for c, errno, errmsg in err_list:
+ c.fp.close()
+ c.fp = None
+ m.remove_handle(c)
+- print "Failed: ", c.filename, c.url, errno, errmsg
++ print("Failed: ", c.filename, c.url, errno, errmsg)
+ freelist.append(c)
+ num_processed = num_processed + len(ok_list) + len(err_list)
+ if num_q == 0:
+@@ -120,3 +125,4 @@ for c in m.handles:
+ c.close()
+ m.close()
+
++#time.sleep(30)
+diff --git a/python/curl/__init__.py b/python/curl/__init__.py
+index b002618..22762c4 100644
+--- a/python/curl/__init__.py
++++ b/python/curl/__init__.py
+@@ -6,11 +6,11 @@
+ #
+ # By Eric S. Raymond, April 2003.
+
+-import os, sys, urllib, exceptions, mimetools, pycurl
++import os, sys, pycurl
+ try:
+- from cStringIO import StringIO
++ from urllib.parse import urlencode
+ except ImportError:
+- from StringIO import StringIO
++ from urllib import urlencode
+
+ try:
+ import signal
+@@ -63,7 +63,7 @@ class Curl:
+
+ def set_option(self, *args):
+ "Set an option on the retrieval."
+- apply(self.handle.setopt, args)
++ self.handle.setopt(*args)
+
+ def set_verbosity(self, level):
+ "Set verbosity to 1 to see transactions."
+@@ -83,14 +83,14 @@ class Curl:
+ def get(self, url="", params=None):
+ "Ship a GET request for a specified URL, capture the response."
+ if params:
+- url += "?" + urllib.urlencode(params)
++ url += "?" + urlencode(params)
+ self.set_option(pycurl.HTTPGET, 1)
+ return self.__request(url)
+
+ def post(self, cgi, params):
+ "Ship a POST request to a specified CGI, capture the response."
+ self.set_option(pycurl.POST, 1)
+- self.set_option(pycurl.POSTFIELDS, urllib.urlencode(params))
++ self.set_option(pycurl.POSTFIELDS, urlencode(params))
+ return self.__request(cgi)
+
+ def body(self):
+@@ -103,7 +103,7 @@ class Curl:
+
+ def get_info(self, *args):
+ "Get information about retrieval."
+- return apply(self.handle.getinfo, args)
++ return self.handle.getinfo(*args)
+
+ def info(self):
+ "Return a dictionary with all info on the last response."
+@@ -164,10 +164,10 @@ if __name__ == "__main__":
+ url = sys.argv[1]
+ c = Curl()
+ c.get(url)
+- print c.body()
+- print '='*74 + '\n'
++ print(c.body())
++ print('='*74 + '\n')
+ import pprint
+ pprint.pprint(c.info())
+- print c.get_info(pycurl.OS_ERRNO)
+- print c.info()['os-errno']
++ print(c.get_info(pycurl.OS_ERRNO))
++ print(c.info()['os-errno'])
+ c.close()
+diff --git a/setup.py b/setup.py
+index 172f280..1e6b21f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,7 @@ def scan_argv(s, default):
+ i = 1
+ while i < len(sys.argv):
+ arg = sys.argv[i]
+- if string.find(arg, s) == 0:
++ if str.find(arg, s) == 0:
+ p = arg[len(s):]
+ assert p, arg
+ del sys.argv[i]
+@@ -46,8 +46,8 @@ def add_libdirs(envvar, sep, fatal=0):
+ v = os.environ.get(envvar)
+ if not v:
+ return
+- for dir in string.split(v, sep):
+- dir = string.strip(dir)
++ for dir in str.split(v, sep):
++ dir = str.strip(dir)
+ if not dir:
+ continue
+ dir = os.path.normpath(dir)
+@@ -55,7 +55,7 @@ def add_libdirs(envvar, sep, fatal=0):
+ if not dir in library_dirs:
+ library_dirs.append(dir)
+ elif fatal:
+- print "FATAL: bad directory %s in environment variable %s" % (dir, envvar)
++ print("FATAL: bad directory %s in environment variable %s" % (dir, envvar))
+ sys.exit(1)
+
+
+@@ -65,13 +65,13 @@ if sys.platform == "win32":
+ # and thus unlikely to match your installation.
+ CURL_DIR = r"c:\src\build\pycurl\curl-7.16.2.1"
+ CURL_DIR = scan_argv("--curl-dir=", CURL_DIR)
+- print "Using curl directory:", CURL_DIR
++ print("Using curl directory:", CURL_DIR)
+ assert os.path.isdir(CURL_DIR), "please check CURL_DIR in setup.py"
+ include_dirs.append(os.path.join(CURL_DIR, "include"))
+ extra_objects.append(os.path.join(CURL_DIR, "lib", "libcurl.lib"))
+ extra_link_args.extend(["gdi32.lib", "wldap32.lib", "winmm.lib", "ws2_32.lib",])
+ add_libdirs("LIB", ";")
+- if string.find(sys.version, "MSC") >= 0:
++ if str.find(sys.version, "MSC") >= 0:
+ extra_compile_args.append("-O2")
+ extra_compile_args.append("-GF") # enable read-only string pooling
+ extra_compile_args.append("-WX") # treat warnings as errors
+@@ -85,10 +85,10 @@ else:
+ CURL_CONFIG = scan_argv("--curl-config=", CURL_CONFIG)
+ d = os.popen("'%s' --version" % CURL_CONFIG).read()
+ if d:
+- d = string.strip(d)
++ d = str.strip(d)
+ if not d:
+- raise Exception, ("`%s' not found -- please install the libcurl development files" % CURL_CONFIG)
+- print "Using %s (%s)" % (CURL_CONFIG, d)
++ raise Exception("`%s' not found -- please install the libcurl development files" % CURL_CONFIG)
++ print("Using %s (%s)" % (CURL_CONFIG, d))
+ for e in split_quoted(os.popen("'%s' --cflags" % CURL_CONFIG).read()):
+ if e[:2] == "-I":
+ # do not add /usr/include
+@@ -209,4 +209,4 @@ if __name__ == "__main__":
+ for o in ext.extra_objects:
+ assert os.path.isfile(o), o
+ # We can live with the deprecationwarning for a while
+- apply(setup, (), setup_args)
++ setup(*(), **setup_args)
+diff --git a/src/pycurl.c b/src/pycurl.c
+index 8b7245d..dc9a90c 100644
+--- a/src/pycurl.c
++++ b/src/pycurl.c
+@@ -97,6 +97,17 @@ static void pycurl_ssl_init(void);
+ static void pycurl_ssl_cleanup(void);
+ #endif
+
++#if PY_MAJOR_VERSION >= 3
++ #define PyInt_Type PyLong_Type
++ #define PyInt_Check(op) PyLong_Check(op)
++ #define PyInt_FromLong PyLong_FromLong
++ #define PyInt_AsLong PyLong_AsLong
++#endif
++
++#ifndef Py_TYPE
++ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
++#endif
++
+ /* Calculate the number of OBJECTPOINT options we need to store */
+ #define OPTIONS_SIZE ((int)CURLOPT_LASTENTRY % 10000)
+ #define MOPTIONS_SIZE ((int)CURLMOPT_LASTENTRY % 10000)
+@@ -161,6 +172,7 @@ typedef struct {
+ PyObject *opensocket_cb;
+ /* file objects */
+ PyObject *readdata_fp;
++ PyObject *writedata;
+ PyObject *writedata_fp;
+ PyObject *writeheader_fp;
+ /* misc */
+@@ -202,16 +214,50 @@ typedef struct {
+ # define PY_LONG_LONG LONG_LONG
+ #endif
+
++int PyUnicode_AsStringAndSize(PyObject *obj, char **buffer, Py_ssize_t *length)
++{
++ Py_ssize_t pysize = PyUnicode_GetSize(obj);
++ wchar_t * str = (wchar_t *) malloc((pysize + 1) * sizeof(wchar_t));
++#if PY_MAJOR_VERSION >= 3
++ PyUnicode_AsWideChar(obj, str, pysize);
++#else
++ PyUnicode_AsWideChar((PyUnicodeObject *) obj, str, pysize);
++#endif
++ str[pysize] = '\0';
++
++// measure size
++ size_t csize = wcstombs(0, str, 0);
++ if( csize == (size_t) -1 )
++ {
++ free(str);
++ return -1;
++ }
++
++ char *cstr = (char *) malloc(csize + 1);
++
++// convert
++ wcstombs(cstr, str, csize + 1);
++ *buffer = cstr;
++ if( length )
++ *length = csize;
++ free(str);
++ return 0;
++}
++
++
+ /* Like PyString_AsString(), but set an exception if the string contains
+ * embedded NULs. Actually PyString_AsStringAndSize() already does that for
+ * us if the `len' parameter is NULL - see Objects/stringobject.c.
+ */
+-
+ static char *PyString_AsString_NoNUL(PyObject *obj)
+ {
+ char *s = NULL;
+ Py_ssize_t r;
++#if PY_MAJOR_VERSION >= 3
++ r = PyUnicode_AsStringAndSize(obj, &s, NULL);
++#else
+ r = PyString_AsStringAndSize(obj, &s, NULL);
++#endif
+ if (r != 0)
+ return NULL; /* exception already set */
+ assert(s != NULL);
+@@ -236,7 +282,11 @@ static PyObject *convert_slist(struct curl_slist *slist, int free_flags)
+ if (slist->data == NULL) {
+ v = Py_None; Py_INCREF(v);
+ } else {
++#if PY_MAJOR_VERSION >= 3
++ v = PyUnicode_FromString(slist->data);
++#else
+ v = PyString_FromString(slist->data);
++#endif
+ }
+ if (v == NULL || PyList_Append(ret, v) != 0) {
+ Py_XDECREF(v);
+@@ -272,7 +322,7 @@ get_thread_state(const CurlObject *self)
+ */
+ if (self == NULL)
+ return NULL;
+- assert(self->ob_type == p_Curl_Type);
++ assert(Py_TYPE(self) == p_Curl_Type);
+ if (self->state != NULL)
+ {
+ /* inside perform() */
+@@ -302,7 +352,7 @@ get_thread_state_multi(const CurlMultiObject *self)
+ */
+ if (self == NULL)
+ return NULL;
+- assert(self->ob_type == p_CurlMulti_Type);
++ assert(Py_TYPE(self) == p_CurlMulti_Type);
+ if (self->state != NULL)
+ {
+ /* inside multi_perform() */
+@@ -318,7 +368,7 @@ static void
+ assert_share_state(const CurlShareObject *self)
+ {
+ assert(self != NULL);
+- assert(self->ob_type == p_CurlShare_Type);
++ assert(Py_TYPE(self) == p_CurlShare_Type);
+ assert(self->lock != NULL);
+ }
+
+@@ -328,7 +378,7 @@ static void
+ assert_curl_state(const CurlObject *self)
+ {
+ assert(self != NULL);
+- assert(self->ob_type == p_Curl_Type);
++ assert(Py_TYPE(self) == p_Curl_Type);
+ (void) get_thread_state(self);
+ }
+
+@@ -338,7 +388,7 @@ static void
+ assert_multi_state(const CurlMultiObject *self)
+ {
+ assert(self != NULL);
+- assert(self->ob_type == p_CurlMulti_Type);
++ assert(Py_TYPE(self) == p_CurlMulti_Type);
+ if (self->state != NULL) {
+ assert(self->multi_handle != NULL);
+ }
+@@ -676,7 +726,8 @@ do_curlshare_setopt(CurlShareObject *self, PyObject *args)
+
+ /* Handle the case of integer arguments */
+ if (PyInt_Check(obj)) {
+- long d = PyInt_AsLong(obj);
++ long d = PyLong_AsLong(obj);
++
+ if (d != CURL_LOCK_DATA_COOKIE && d != CURL_LOCK_DATA_DNS) {
+ goto error;
+ }
+@@ -750,6 +801,7 @@ util_curl_new(void)
+ return self;
+ }
+
++size_t default_write_callback(char *ptr, size_t size, size_t nmemb, void *stream);
+
+ /* constructor - this is a module-level function returning a new instance */
+ static CurlObject *
+@@ -809,11 +861,22 @@ do_curl_new(PyObject *dummy)
+ }
+ self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
+
++#if PY_MAJOR_VERSION >= 3
++ res = curl_easy_setopt(self->handle, CURLOPT_WRITEFUNCTION, default_write_callback);
++ if (res != CURLE_OK) {
++ goto error;
++ }
++ res = curl_easy_setopt(self->handle, CURLOPT_WRITEDATA, self);
++ if (res != CURLE_OK) {
++ goto error;
++ }
++#endif
++
+ /* Success - return new object */
+ return self;
+
+ error:
+- Py_DECREF(self); /* this also closes self->handle */
++ Py_XDECREF(self); /* this also closes self->handle */
+ PyErr_SetString(ErrorObject, "initializing curl failed");
+ return NULL;
+ }
+@@ -880,7 +943,7 @@ util_curl_close(CurlObject *self)
+ /* Zero handle and thread-state to disallow any operations to be run
+ * from now on */
+ assert(self != NULL);
+- assert(self->ob_type == p_Curl_Type);
++ assert(Py_TYPE(self) == p_Curl_Type);
+ handle = self->handle;
+ self->handle = NULL;
+ if (handle == NULL) {
+@@ -965,7 +1028,12 @@ do_curl_errstr(CurlObject *self)
+ return NULL;
+ }
+ self->error[sizeof(self->error) - 1] = 0;
++
++#if PY_MAJOR_VERSION >= 3
++ return PyUnicode_FromString(self->error);
++#else
+ return PyString_FromString(self->error);
++#endif
+ }
+
+
+@@ -1125,6 +1193,52 @@ write_callback(char *ptr, size_t size, size_t nmemb, void *stream)
+ return util_write_callback(0, ptr, size, nmemb, stream);
+ }
+
++
++size_t
++default_write_callback(char *ptr, size_t size, size_t nmemb, void *stream)
++{
++ CurlObject *obj = (CurlObject *)stream;
++ PyThreadState *tmp_state;
++ CurlObject *self = (CurlObject *)stream;
++
++ /* acquire thread */
++ int ret = 0;
++ tmp_state = get_thread_state(self);
++ if (tmp_state == NULL)
++ return ret;
++ PyEval_AcquireThread(tmp_state);
++
++ if(obj->writedata_fp != NULL)
++ {
++ /**
++ * I'd prefer this code, but
++ * PyFile_WriteObject converts the object to str or repr, which are of type str
++ * and the write() fn expects bytes or buffer ...
++ */
++/*
++ PyObject *w = PyBytes_FromStringAndSize(ptr, size*nmemb);
++ printf("writedata_fp %p w %p s %i\n", obj->writedata_fp, w, PyBytes_GET_SIZE(w));
++ Py_INCREF(w);
++ if( PyFile_WriteObject(w, obj->writedata_fp, Py_PRINT_RAW) != 0 )
++ {
++ PyErr_Print();
++ ret = -1;
++ }
++
++ Py_DECREF(w);
++*/
++ int fd = PyObject_AsFileDescriptor(((CurlObject *)stream)->writedata_fp);
++ ret = write(fd, ptr, size*nmemb);
++ }else
++ {
++ fwrite(ptr, size, nmemb, stdout);
++ }
++
++ PyEval_ReleaseThread(tmp_state);
++ return ret;
++}
++
++
+ static size_t
+ header_callback(char *ptr, size_t size, size_t nmemb, void *stream)
+ {
+@@ -1166,6 +1280,7 @@ opensocket_callback(void *clientp, curlsocktype purpose,
+ ret = CURL_SOCKET_BAD;
+ goto verbose_error;
+ }
++
+ // normal operation:
+ if (PyInt_Check(fileno_result)) {
+ ret = dup(PyInt_AsLong(fileno_result));
+@@ -1227,11 +1342,19 @@ read_callback(char *ptr, size_t size, size_t nmemb, void *stream)
+ goto verbose_error;
+
+ /* handle result */
++#if PY_MAJOR_VERSION >= 3
++ if (PyBytes_Check(result)) {
++#else
+ if (PyString_Check(result)) {
++#endif
+ char *buf = NULL;
+ Py_ssize_t obj_size = -1;
+ Py_ssize_t r;
++#if PY_MAJOR_VERSION >= 3
++ r = PyBytes_AsStringAndSize(result, &buf, &obj_size);
++#else
+ r = PyString_AsStringAndSize(result, &buf, &obj_size);
++#endif
+ if (r != 0 || obj_size < 0 || obj_size > total_size) {
+ PyErr_Format(ErrorObject, "invalid return value for read callback %ld %ld", (long)obj_size, (long)total_size);
+ goto verbose_error;
+@@ -1404,6 +1527,7 @@ ioctl_callback(CURL *curlobj, int cmd, void *stream)
+ if (result == Py_None) {
+ ret = CURLIOE_OK; /* None means success */
+ }
++
+ else if (PyInt_Check(result)) {
+ ret = (int) PyInt_AsLong(result);
+ if (ret >= CURLIOE_LAST || ret < 0) {
+@@ -1587,7 +1711,11 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ #endif
+
+ /* Handle the case of string arguments */
++#if PY_MAJOR_VERSION >= 3
++ if (PyUnicode_Check(obj)) {
++#else
+ if (PyString_Check(obj)) {
++#endif
+ char *str = NULL;
+ Py_ssize_t len = -1;
+ char *buf;
+@@ -1636,8 +1764,13 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ return NULL;
+ break;
+ case CURLOPT_POSTFIELDS:
++#if PY_MAJOR_VERSION >= 3
++ if (PyUnicode_AsStringAndSize(obj, &str, &len) != 0)
++ return NULL;
++#else
+ if (PyString_AsStringAndSize(obj, &str, &len) != 0)
+ return NULL;
++#endif
+ /* automatically set POSTFIELDSIZE */
+ if (len <= INT_MAX) {
+ res = curl_easy_setopt(self->handle, CURLOPT_POSTFIELDSIZE, (long)len);
+@@ -1686,7 +1819,6 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ /* Handle the case of integer arguments */
+ if (PyInt_Check(obj)) {
+ long d = PyInt_AsLong(obj);
+-
+ if (IS_LONG_OPTION(option))
+ res = curl_easy_setopt(self->handle, (CURLoption)option, (long)d);
+ else if (IS_OFF_T_OPTION(option))
+@@ -1727,8 +1859,12 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ #undef IS_OFF_T_OPTION
+
+ /* Handle the case of file objects */
++#if PY_MAJOR_VERSION >= 3
++ extern PyTypeObject PyIOBase_Type;
++ if(PyObject_IsInstance(obj, (PyObject *)&PyIOBase_Type) == 1) {
++#else
+ if (PyFile_Check(obj)) {
+- FILE *fp;
++#endif
+
+ /* Ensure the option specified a file as well as the input */
+ switch (option) {
+@@ -1745,7 +1881,13 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ PyErr_SetString(PyExc_TypeError, "files are not supported for this option");
+ return NULL;
+ }
+-
++#if PY_MAJOR_VERSION >= 3
++// printf("WRITEDATA %p\n",obj);
++// int fd = PyObject_AsFileDescriptor(obj);
++// printf("fd is %i\n", fd);
++// fp = fdopen(fd, "w");
++#else
++ FILE *fp;
+ fp = PyFile_AsFile(obj);
+ if (fp == NULL) {
+ PyErr_SetString(PyExc_TypeError, "second argument must be open file");
+@@ -1755,6 +1897,7 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ if (res != CURLE_OK) {
+ CURLERROR_RETVAL();
+ }
++#endif
+ Py_INCREF(obj);
+
+ switch (option) {
+@@ -1844,14 +1987,27 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ PyErr_SetString(PyExc_TypeError, "tuple must contain two elements (name, value)");
+ return NULL;
+ }
++#if PY_MAJOR_VERSION >= 3
++ if (PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(listitem, 0), &nstr, &nlen) != 0) {
++#else
+ if (PyString_AsStringAndSize(PyTuple_GET_ITEM(listitem, 0), &nstr, &nlen) != 0) {
++#endif
+ curl_formfree(post);
+ PyErr_SetString(PyExc_TypeError, "tuple must contain string as first element");
+ return NULL;
+ }
++#if PY_MAJOR_VERSION >= 3
++ if (PyUnicode_Check(PyTuple_GET_ITEM(listitem, 1))) {
++#else
+ if (PyString_Check(PyTuple_GET_ITEM(listitem, 1))) {
++#endif
+ /* Handle strings as second argument for backwards compatibility */
++
++#if PY_MAJOR_VERSION >= 3
++ PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(listitem, 1), &cstr, &clen);
++#else
+ PyString_AsStringAndSize(PyTuple_GET_ITEM(listitem, 1), &cstr, &clen);
++#endif
+ /* INFO: curl_formadd() internally does memdup() the data, so
+ * embedded NUL characters _are_ allowed here. */
+ res = curl_formadd(&post, &last,
+@@ -1905,7 +2061,11 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ curl_formfree(post);
+ return NULL;
+ }
++#if PY_MAJOR_VERSION >= 3
++ if (!PyUnicode_Check(PyTuple_GET_ITEM(t, j+1))) {
++#else
+ if (!PyString_Check(PyTuple_GET_ITEM(t, j+1))) {
++#endif
+ PyErr_SetString(PyExc_TypeError, "value must be string");
+ PyMem_Free(forms);
+ curl_formfree(post);
+@@ -1923,7 +2083,11 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ curl_formfree(post);
+ return NULL;
+ }
++#if PY_MAJOR_VERSION >= 3
++ PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(t, j+1), &ostr, &olen);
++#else
+ PyString_AsStringAndSize(PyTuple_GET_ITEM(t, j+1), &ostr, &olen);
++#endif
+ forms[k].option = val;
+ forms[k].value = ostr;
+ ++k;
+@@ -1975,7 +2139,11 @@ do_curl_setopt(CurlObject *self, PyObject *args)
+ struct curl_slist *nlist;
+ char *str;
+
++#if PY_MAJOR_VERSION >= 3
++ if (!PyUnicode_Check(listitem)) {
++#else
+ if (!PyString_Check(listitem)) {
++#endif
+ curl_slist_free_all(slist);
+ PyErr_SetString(PyExc_TypeError, "list items must be string objects");
+ return NULL;
+@@ -2190,7 +2358,12 @@ do_curl_getinfo(CurlObject *self, PyObject *args)
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
++#if PY_MAJOR_VERSION >= 3
++ return PyUnicode_FromString(s_res);
++#else
+ return PyString_FromString(s_res);
++#endif
++
+ }
+
+ case CURLINFO_CONNECT_TIME:
+@@ -2849,7 +3022,7 @@ do_multi_info_read(CurlMultiObject *self, PyObject *args)
+ Py_DECREF(ok_list);
+ CURLERROR_MSG("Unable to fetch curl handle from curl object");
+ }
+- assert(co->ob_type == p_Curl_Type);
++ assert(Py_TYPE(co) == p_Curl_Type);
+ if (msg->msg != CURLMSG_DONE) {
+ /* FIXME: what does this mean ??? */
+ }
+@@ -2930,7 +3103,6 @@ do_multi_select(CurlMultiObject *self, PyObject *args)
+ * socket code to report any errors.
+ */
+ }
+-
+ return PyInt_FromLong(n);
+ }
+
+@@ -2995,6 +3167,116 @@ static PyObject *curlobject_constants = NULL;
+ static PyObject *curlmultiobject_constants = NULL;
+ static PyObject *curlshareobject_constants = NULL;
+
++
++#if PY_MAJOR_VERSION >= 3
++static PyObject *
++my_getattro(PyObject *co, PyObject *name, PyObject *dict1, PyObject *dict2, PyMethodDef *m)
++{
++ PyObject *v = NULL;
++ if( v == NULL && dict1 != NULL )
++ v = PyDict_GetItem(dict1, name);
++ if( v == NULL && dict2 != NULL )
++ v = PyDict_GetItem(dict2, name);
++ if( v != NULL )
++ {
++ Py_INCREF(v);
++ return v;
++ }
++ return NULL;
++}
++
++static int
++my_setattro(PyObject **dict, PyObject *name, PyObject *v)
++{
++ if( *dict == NULL )
++ {
++ *dict = PyDict_New();
++ if( *dict == NULL )
++ return -1;
++ }
++ return PyDict_SetItem(*dict, name, v);
++}
++
++PyObject *do_curl_getattro(PyObject *o, PyObject *n)
++{
++ PyObject *v = PyObject_GenericGetAttr(o, n);
++ if( !v && PyErr_ExceptionMatches(PyExc_AttributeError) )
++ {
++ PyErr_Clear();
++ v = my_getattro(o, n, ((CurlObject *)o)->dict,
++ curlobject_constants, curlobject_methods);
++ }
++ return v;
++}
++
++static int
++do_curl_setattro(PyObject *o, PyObject *name, PyObject *v)
++{
++ assert_curl_state((CurlObject *)o);
++ if( v )
++ {
++ return my_setattro(&((CurlObject *)o)->dict, name, v);
++ } else
++ {
++ return PyObject_GenericSetAttr(o, name, 0);
++ }
++}
++
++static PyObject *
++do_multi_getattro(PyObject *o, PyObject *n)
++{
++ assert_multi_state((CurlMultiObject *)o);
++ PyObject *v = PyObject_GenericGetAttr(o, n);
++ if( !v && PyErr_ExceptionMatches(PyExc_AttributeError) )
++ {
++ PyErr_Clear();
++ v = my_getattro(o, n, ((CurlMultiObject *)o)->dict,
++ curlmultiobject_constants, curlmultiobject_methods);
++ }
++ return v;
++}
++
++static int
++do_multi_setattro(PyObject *o, PyObject *n, PyObject *v)
++{
++ assert_multi_state((CurlMultiObject *)o);
++ if( v )
++ {
++ return my_setattro(&((CurlMultiObject *)o)->dict, n, v);
++ } else
++ {
++ return PyObject_GenericSetAttr(o, n, 0);
++ }
++}
++
++static PyObject *
++do_share_getattro(PyObject *o, PyObject *n)
++{
++ assert_share_state((CurlShareObject *)o);
++ PyObject *v = PyObject_GenericGetAttr(o, n);
++ if( !v && PyErr_ExceptionMatches(PyExc_AttributeError) )
++ {
++ PyErr_Clear();
++ v = my_getattro(o, n, ((CurlShareObject *)o)->dict,
++ curlshareobject_constants, curlshareobject_methods);
++ }
++ return v;
++}
++
++static int
++do_share_setattro(PyObject *o, PyObject *n, PyObject *v)
++{
++ assert_share_state((CurlShareObject *)o);
++ if( v )
++ {
++ return my_setattro(&((CurlShareObject *)o)->dict, n, v);
++ } else
++ {
++ return PyObject_GenericSetAttr(o, n, 0);
++ }
++}
++
++#else
+ static int
+ my_setattr(PyObject **dict, char *name, PyObject *v)
+ {
+@@ -3029,6 +3311,7 @@ my_getattr(PyObject *co, char *name, PyObject *dict1, PyObject *dict2, PyMethodD
+ return Py_FindMethod(m, co, name);
+ }
+
++
+ static int
+ do_share_setattr(CurlShareObject *so, char *name, PyObject *v)
+ {
+@@ -3073,10 +3356,53 @@ do_multi_getattr(CurlMultiObject *co, char *name)
+ return my_getattr((PyObject *)co, name, co->dict,
+ curlmultiobject_constants, curlmultiobject_methods);
+ }
++#endif
+
+
+-/* --------------- actual type definitions --------------- */
+
++/* --------------- actual type definitions --------------- */
++#if PY_MAJOR_VERSION >= 3
++static PyTypeObject CurlShare_Type = {
++ PyVarObject_HEAD_INIT(NULL, 0)
++ "pycurl.CurlShare", /* tp_name */
++ sizeof(CurlShareObject), /* tp_basicsize */
++ 0, /* tp_itemsize */
++ (destructor)do_share_dealloc,/* tp_dealloc */
++ 0, /* tp_print */
++ 0, /* tp_getattr */
++ 0, /* tp_setattr */
++ 0, /* tp_reserved */
++ 0, /* tp_repr */
++ 0, /* tp_as_number */
++ 0, /* tp_as_sequence */
++ 0, /* tp_as_mapping */
++ 0, /* tp_hash */
++ 0, /* tp_call */
++ 0, /* tp_str */
++ (getattrofunc)do_share_getattro, /* tp_getattro */
++ (setattrofunc)do_share_setattro, /* tp_setattro */
++ 0, /* tp_as_buffer */
++ Py_TPFLAGS_HAVE_GC, /* tp_flags */
++ 0, /* tp_doc */
++ (traverseproc)do_share_traverse, /* tp_traverse */
++ (inquiry)do_share_clear, /* tp_clear */
++ 0, /* tp_richcompare */
++ 0, /* tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext */
++ curlshareobject_methods, /* tp_methods */
++ 0, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get */
++ 0, /* tp_descr_set */
++ 0, /* tp_dictoffset */
++ 0, /* tp_init */
++ 0, /* tp_alloc */
++ 0, /* tp_new */
++};
++#else
+ static PyTypeObject CurlShare_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+@@ -3107,7 +3433,50 @@ static PyTypeObject CurlShare_Type = {
+ * safely ignore any compiler warnings about missing initializers.
+ */
+ };
++#endif
+
++#if PY_MAJOR_VERSION >= 3
++static PyTypeObject Curl_Type = {
++ PyVarObject_HEAD_INIT(NULL, 0)
++ "pycurl.Curl", /* tp_name */
++ sizeof(CurlObject), /* tp_basicsize */
++ 0, /* tp_itemsize */
++ (destructor)do_curl_dealloc,/* tp_dealloc */
++ 0, /* tp_print */
++ 0, /* tp_getattr */
++ 0, /* tp_setattr */
++ 0, /* tp_reserved */
++ 0, /* tp_repr */
++ 0, /* tp_as_number */
++ 0, /* tp_as_sequence */
++ 0, /* tp_as_mapping */
++ 0, /* tp_hash */
++ 0, /* tp_call */
++ 0, /* tp_str */
++ (getattrofunc)do_curl_getattro, /* tp_getattro */
++ (setattrofunc)do_curl_setattro, /* tp_setattro */
++ 0, /* tp_as_buffer */
++ Py_TPFLAGS_HAVE_GC, /* tp_flags */
++ 0, /* tp_doc */
++ (traverseproc)do_curl_traverse, /* tp_traverse */
++ (inquiry)do_curl_clear, /* tp_clear */
++ 0, /* tp_richcompare */
++ 0, /* tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext */
++ curlobject_methods, /* tp_methods */
++ 0, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get */
++ 0, /* tp_descr_set */
++ 0, /* tp_dictoffset */
++ 0, /* tp_init */
++ 0, /* tp_alloc */
++ 0, /* tp_new */
++};
++#else
+ static PyTypeObject Curl_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+@@ -3138,7 +3507,50 @@ static PyTypeObject Curl_Type = {
+ * safely ignore any compiler warnings about missing initializers.
+ */
+ };
++#endif
+
++#if PY_MAJOR_VERSION >= 3
++static PyTypeObject CurlMulti_Type = {
++ PyVarObject_HEAD_INIT(NULL, 0)
++ "pycurl.CurlMulti", /* tp_name */
++ sizeof(CurlMultiObject), /* tp_basicsize */
++ 0, /* tp_itemsize */
++ (destructor)do_multi_dealloc,/* tp_dealloc */
++ 0, /* tp_print */
++ 0, // (getattrfunc)do_curl_getattr, /* tp_getattr */
++ 0, //(setattrfunc)do_curl_setattr, /* tp_setattr */
++ 0, /* tp_reserved */
++ 0, /* tp_repr */
++ 0, /* tp_as_number */
++ 0, /* tp_as_sequence */
++ 0, /* tp_as_mapping */
++ 0, /* tp_hash */
++ 0, /* tp_call */
++ 0, /* tp_str */
++ (getattrofunc)do_multi_getattro, //0, /* tp_getattro */
++ (setattrofunc)do_multi_setattro, /* tp_setattro */
++ 0, /* tp_as_buffer */
++ Py_TPFLAGS_HAVE_GC, /* tp_flags */
++ 0, /* tp_doc */
++ (traverseproc)do_multi_traverse, /* tp_traverse */
++ (inquiry)do_multi_clear, /* tp_clear */
++ 0, /* tp_richcompare */
++ 0, /* tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext */
++ curlmultiobject_methods, /* tp_methods */
++ 0, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get */
++ 0, /* tp_descr_set */
++ 0, /* tp_dictoffset */
++ 0, /* tp_init */
++ 0, /* tp_alloc */
++ 0, /* tp_new */
++};
++#else
+ static PyTypeObject CurlMulti_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+@@ -3169,7 +3581,7 @@ static PyTypeObject CurlMulti_Type = {
+ * safely ignore any compiler warnings about missing initializers.
+ */
+ };
+-
++#endif
+
+ /*************************************************************************
+ // module level
+@@ -3227,7 +3639,11 @@ static PyObject *vi_str(const char *s)
+ }
+ while (*s == ' ' || *s == '\t')
+ s++;
++#if PY_MAJOR_VERSION >= 3
++ return PyUnicode_FromString(s);
++#else
+ return PyString_FromString(s);
++#endif
+ }
+
+ static PyObject *
+@@ -3354,7 +3770,13 @@ insobj2(PyObject *dict1, PyObject *dict2, char *name, PyObject *value)
+ goto error;
+ if (value == NULL)
+ goto error;
++
++#if PY_MAJOR_VERSION >= 3
++ key = PyUnicode_FromString(name);
++#else
+ key = PyString_FromString(name);
++#endif
++
+ if (key == NULL)
+ goto error;
+ #if 0
+@@ -3381,7 +3803,11 @@ error:
+ static void
+ insstr(PyObject *d, char *name, char *value)
+ {
++#if PY_MAJOR_VERSION >= 3
++ PyObject *v = PyUnicode_FromString(value);
++#else
+ PyObject *v = PyString_FromString(value);
++#endif
+ insobj2(d, NULL, name, v);
+ }
+
+@@ -3414,6 +3840,20 @@ insint_m(PyObject *d, char *name, long value)
+ }
+
+
++#if PY_MAJOR_VERSION >= 3
++static PyModuleDef curlmodule = {
++ PyModuleDef_HEAD_INIT,
++ "pycurl",
++ module_doc,
++ -1,
++ curl_methods, NULL, NULL, NULL, NULL
++};
++#endif
++
++
++#if PY_MAJOR_VERSION >= 3
++PyMODINIT_FUNC PyInit_pycurl(void)
++#else
+ /* Initialization function for the module */
+ #if defined(PyMODINIT_FUNC)
+ PyMODINIT_FUNC
+@@ -3424,6 +3864,7 @@ extern "C"
+ DL_EXPORT(void)
+ #endif
+ initpycurl(void)
++#endif
+ {
+ PyObject *m, *d;
+ const curl_version_info_data *vi;
+@@ -3433,13 +3874,29 @@ initpycurl(void)
+ p_Curl_Type = &Curl_Type;
+ p_CurlMulti_Type = &CurlMulti_Type;
+ p_CurlShare_Type = &CurlShare_Type;
+- Curl_Type.ob_type = &PyType_Type;
+- CurlMulti_Type.ob_type = &PyType_Type;
+- CurlShare_Type.ob_type = &PyType_Type;
++ Py_TYPE(&Curl_Type) = &PyType_Type;
++ Py_TYPE(&CurlMulti_Type) = &PyType_Type;
++ Py_TYPE(&CurlShare_Type) = &PyType_Type;
+
+ /* Create the module and add the functions */
++#if PY_MAJOR_VERSION >= 3
++ if (PyType_Ready(&Curl_Type) < 0)
++ return NULL;
++
++ if (PyType_Ready(&CurlMulti_Type) < 0)
++ return NULL;
++
++
++ m = PyModule_Create(&curlmodule);
++ if (m == NULL)
++ return NULL;
++
++ Py_INCREF(&Curl_Type);
++#else
++
+ m = Py_InitModule3("pycurl", curl_methods, module_doc);
+ assert(m != NULL && PyModule_Check(m));
++#endif
+
+ /* Add error object to the module */
+ d = PyModule_GetDict(m);
+@@ -3906,6 +4363,9 @@ initpycurl(void)
+ /* Finally initialize global interpreter lock */
+ PyEval_InitThreads();
+
++#if PY_MAJOR_VERSION >= 3
++ return m;
++#endif
+ }
+
+ /* vi:ts=4:et:nowrap
+diff --git a/tests/test_internals.py b/tests/test_internals.py
+index afcc53d..7c2f602 100644
+--- a/tests/test_internals.py
++++ b/tests/test_internals.py
+@@ -16,7 +16,10 @@ try:
+ except ImportError:
+ gc = None
+ import copy, os, sys
+-from StringIO import StringIO
++try:
++ from io import StringIO
++except ImportError:
++ from StringIO import StringIO
+ try:
+ import cPickle
+ except ImportError:
+@@ -41,10 +44,10 @@ if "-q" in sys.argv:
+ opts.verbose = opts.verbose - 1
+
+
+-print "Python", sys.version
+-print "PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM)
+-print "PycURL version info", pycurl.version_info()
+-print " %s, compiled %s" % (pycurl.__file__, pycurl.COMPILE_DATE)
++print("Python", sys.version)
++print("PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM))
++print("PycURL version info", pycurl.version_info())
++print(" %s, compiled %s" % (pycurl.__file__, pycurl.COMPILE_DATE))
+
+
+ # /***********************************************************************
+@@ -148,13 +151,13 @@ if 1 and copy:
+ m = CurlMulti()
+ try:
+ copy.copy(c)
+- except copy.Error:
++ except (copy.Error, TypeError):
+ pass
+ else:
+ assert 0, "internal error - copying should fail"
+ try:
+ copy.copy(m)
+- except copy.Error:
++ except (copy.Error, TypeError):
+ pass
+ else:
+ assert 0, "internal error - copying should fail"
+@@ -166,13 +169,13 @@ if 1 and pickle:
+ p = pickle.Pickler(fp, 1)
+ try:
+ p.dump(c)
+- except pickle.PicklingError:
++ except (pickle.PicklingError, TypeError):
+ pass
+ else:
+ assert 0, "internal error - pickling should fail"
+ try:
+ p.dump(m)
+- except pickle.PicklingError:
++ except (pickle.PicklingError, TypeError):
+ pass
+ else:
+ assert 0, "internal error - pickling should fail"
+@@ -229,7 +232,9 @@ if 1 and gc:
+ c.m.c = c
+ # delete
+ gc.collect()
+- flags = gc.DEBUG_COLLECTABLE | gc.DEBUG_UNCOLLECTABLE | gc.DEBUG_OBJECTS
++ flags = gc.DEBUG_COLLECTABLE | gc.DEBUG_UNCOLLECTABLE
++ if hasattr(gc, "DEBUG_OBJECTS"):
++ flags = flags | gc.DEBUG_OBJECTS
+ if opts.verbose >= 1:
+ flags = flags | gc.DEBUG_STATS
+ gc.set_debug(flags)
+@@ -237,17 +242,17 @@ if 1 and gc:
+ ##print gc.get_referrers(c)
+ ##print gc.get_objects()
+ if opts.verbose >= 1:
+- print "Tracked objects:", len(gc.get_objects())
++ print("Tracked objects:", len(gc.get_objects()))
+ # The `del' below should delete these 4 objects:
+ # Curl + internal dict, CurlMulti + internal dict
+ del c
+ gc.collect()
+ if opts.verbose >= 1:
+- print "Tracked objects:", len(gc.get_objects())
++ print("Tracked objects:", len(gc.get_objects()))
+
+
+ # /***********************************************************************
+ # // done
+ # ************************************************************************/
+
+-print "All tests passed."
++print("All tests passed.")
+diff --git a/tests/test_memleak.py b/tests/test_memleak.py
+index 284df62..ad7bad1 100644
+--- a/tests/test_memleak.py
++++ b/tests/test_memleak.py
+@@ -12,20 +12,22 @@ import gc, pycurl, sys
+ gc.enable()
+
+
+-print "Python", sys.version
+-print "PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM)
++print("Python", sys.version)
++print("PycURL %s (compiled against 0x%x)" % (pycurl.version, pycurl.COMPILE_LIBCURL_VERSION_NUM))
+ ##print "PycURL version info", pycurl.version_info()
+-print " %s, compiled %s" % (pycurl.__file__, pycurl.COMPILE_DATE)
++print(" %s, compiled %s" % (pycurl.__file__, pycurl.COMPILE_DATE))
+
+
+ gc.collect()
+-flags = gc.DEBUG_COLLECTABLE | gc.DEBUG_UNCOLLECTABLE | gc.DEBUG_OBJECTS
++flags = gc.DEBUG_COLLECTABLE | gc.DEBUG_UNCOLLECTABLE
++if hasattr(gc, "DEBUG_OBJECTS"):
++ flags = flags | gc.DEBUG_OBJECTS
+ if 1:
+ flags = flags | gc.DEBUG_STATS
+ gc.set_debug(flags)
+ gc.collect()
+
+-print "Tracked objects:", len(gc.get_objects())
++print("Tracked objects:", len(gc.get_objects()))
+
+ multi = pycurl.CurlMulti()
+ t = []
+@@ -34,20 +36,20 @@ for a in range(100):
+ multi.add_handle(curl)
+ t.append(curl)
+
+-print "Tracked objects:", len(gc.get_objects())
++print("Tracked objects:", len(gc.get_objects()))
+
+ for curl in t:
+ curl.close()
+ multi.remove_handle(curl)
+
+-print "Tracked objects:", len(gc.get_objects())
++print("Tracked objects:", len(gc.get_objects()))
+
+ del curl
+ del t
+ del multi
+
+-print "Tracked objects:", len(gc.get_objects())
++print("Tracked objects:", len(gc.get_objects()))
+ gc.collect()
+-print "Tracked objects:", len(gc.get_objects())
++print("Tracked objects:", len(gc.get_objects()))
+
+
diff --git a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
new file mode 100644
index 000000000000..668857445626
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.1 2013/02/05 22:37:49 mgorny Exp $
+
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl"
+SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+DEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
+ ssl? (
+ net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl]
+ curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+ )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}/${P}-linking-v2.patch"
+ )
+
+ sed -e "/data_files=/d" -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" tests/test_internals.py -q || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+
+ distutils-r1_python_install_all
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
new file mode 100644
index 000000000000..f06af3f5ec4a
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.1 2013/02/06 03:01:47 floppym Exp $
+
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl"
+SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+DEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
+ ssl? (
+ net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl]
+ curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+ )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}/${P}-linking-v2.patch"
+ "${FILESDIR}/${P}-python3.patch"
+ )
+
+ sed -e "/data_files=/d" -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" tests/test_internals.py -q || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+
+ distutils-r1_python_install_all
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/python-gudev/metadata.xml b/dev-python/python-gudev/metadata.xml
index c6bbdb9e50d4..8d1fe9a39aaa 100644
--- a/dev-python/python-gudev/metadata.xml
+++ b/dev-python/python-gudev/metadata.xml
@@ -1,9 +1,7 @@
-
- ford_prefect@gentoo.org
-
+proxy-maintainers
laurento.frittella@gmail.com
Proxy Maintainer (please CC on bugs)
diff --git a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
new file mode 100644
index 000000000000..65d3c6519be0
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.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/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild,v 1.1 2013/02/06 00:38:50 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+PY2_USEDEP=$(python_gen_usedep python2*)
+
+RDEPEND=">=net-libs/zeromq-2.1.9"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PY2_USEDEP}]
+ dev-python/gevent[${PY2_USEDEP}]
+ www-servers/tornado[${PY2_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0.1-python3.patch"
+)
+
+# Configure checks write to cwd.
+# https://github.com/zeromq/pyzmq/issues/318
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ if [[ ${EPYTHON} == python3* ]]; then
+ einfo "Skipping tests for ${EPYTHON}, not supported."
+ continue
+ fi
+
+ nosetests -svw build/lib* || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 4b39be6c8809..b5658ca18079 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1 @@
-DIST Sphinx-1.0.7.tar.gz 2285875 SHA256 80d62f3f7913c3322bf279ec26bfb12c1ce70404b00f4c87dc3ac190d150b0ab SHA512 15a03a45f6c401c532e5c806f6a8453d89018a44afb1ec1906c5ccbf7bff2234f4d2d30979344991bb697c70cbdcc63b774590951cdc52cb7fe55ff083a8664d WHIRLPOOL 9ea18475b9489f88de551ffdbc924af933d09f937becba27d2f9aaa1ac4634c905891a179f8b3552b3843c42e1b5e70ad9e6e3ddd291b5dfa5b31727755ee446
-DIST Sphinx-1.1.2.tar.gz 2624636 SHA256 cf66ee61eef61b7c478907282bddcdd5e04eebd69a00a2bb93881427938fe688 SHA512 30124729c45ca4b08e22cb93084620290308720d832998630825764453676b56d61f107153e812b2b89d90336a0df736bb4b11df8e30292d93523a7fc97b1279 WHIRLPOOL d144bb26904900de64c2d3c423370eec5d7b97974c4f469adb2e79e1db3d2de95e7d4706ec899b4b2307193fcaa6cb19d48f1cd1518c2d260c881ef2e39fa013
DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 SHA512 b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052 WHIRLPOOL a40c4d0f5c32cf1d4b9b662b0fb2b2b0956e0455abbc88d6b5f95c54f93cc2baae25e8b9196dd0b64090d30a1a796c336ca4b6866243be4198ccdf67a7e18b48
diff --git a/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch b/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch
new file mode 100644
index 000000000000..82609f4afdca
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-1.1.3-docutils-manpage.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Georg Brandl
+# Date 1351590528 -3600
+# Node ID ffb145b7884fc926d6a68f4aaeede1d4964f727c
+# Parent 2c107bc997e8817c451ba24089766eefb6e60fc3
+Closes #998: fix manpage writer in expectation of docutils 0.10 API change
+
+diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
+--- a/sphinx/writers/manpage.py
++++ b/sphinx/writers/manpage.py
+@@ -72,6 +72,11 @@
+ # since self.append_header() is never called, need to do this here
+ self.body.append(MACRO_DEF)
+
++ # Overwrite admonition label translations with our own
++ for label, translation in admonitionlabels.items():
++ self.language.labels[label] = self.deunicode(translation)
++
++
+ # overwritten -- added quotes around all .TH arguments
+ def header(self):
+ tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
+@@ -193,12 +198,6 @@
+ def depart_seealso(self, node):
+ self.depart_admonition(node)
+
+- # overwritten -- use our own label translations
+- def visit_admonition(self, node, name=None):
+- if name:
+- self.body.append('.IP %s\n' %
+- self.deunicode(admonitionlabels.get(name, name)))
+-
+ def visit_productionlist(self, node):
+ self.ensure_eol()
+ names = []
diff --git a/dev-python/sphinx/sphinx-1.0.7.ebuild b/dev-python/sphinx/sphinx-1.0.7.ebuild
deleted file mode 100644
index d3d34789abb8..000000000000
--- a/dev-python/sphinx/sphinx-1.0.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.0.7.ebuild,v 1.11 2012/03/10 17:50:10 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex"
-
-DEPEND=">=dev-python/docutils-0.5
- >=dev-python/jinja-2.2
- >=dev-python/pygments-0.8
- dev-python/setuptools
- latex? ( dev-texlive/texlive-latexextra )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- pushd doc > /dev/null
- einfo "Generation of documentation"
- PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed"
- popd > /dev/null
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
- fi
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- # Generate the Grammar pickle to avoid sandbox violations.
- generation_of_grammar_pickle() {
- "$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
- }
- python_execute_function \
- --action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
- generation_of_grammar_pickle
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- deletion_of_grammar_pickle() {
- rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
-
- # Delete empty parent directories.
- local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
- while [[ "${dir}" != "${EROOT%/}" ]]; do
- rmdir "${dir}" 2> /dev/null || break
- dir="${dir%/*}"
- done
- }
- python_execute_function \
- --action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
- deletion_of_grammar_pickle
-}
diff --git a/dev-python/sphinx/sphinx-1.1.2.ebuild b/dev-python/sphinx/sphinx-1.1.2.ebuild
deleted file mode 100644
index ca9505ef4a96..000000000000
--- a/dev-python/sphinx/sphinx-1.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.2.ebuild,v 1.11 2012/05/28 14:15:36 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex"
-
-DEPEND=">=dev-python/docutils-0.7
- >=dev-python/jinja-2.3
- >=dev-python/pygments-1.2
- dev-python/setuptools
- latex? ( dev-texlive/texlive-latexextra )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- pushd doc > /dev/null
- einfo "Generation of documentation"
- PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed"
- popd > /dev/null
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
- fi
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- # Generate the Grammar pickle to avoid sandbox violations.
- generation_of_grammar_pickle() {
- "$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
- }
- python_execute_function \
- --action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
- generation_of_grammar_pickle
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- deletion_of_grammar_pickle() {
- rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
-
- # Delete empty parent directories.
- local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
- while [[ "${dir}" != "${EROOT%/}" ]]; do
- rmdir "${dir}" 2> /dev/null || break
- dir="${dir%/*}"
- done
- }
- python_execute_function \
- --action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
- deletion_of_grammar_pickle
-}
diff --git a/dev-python/sphinx/sphinx-1.1.3-r1.ebuild b/dev-python/sphinx/sphinx-1.1.3-r1.ebuild
deleted file mode 100644
index 33264bdbe857..000000000000
--- a/dev-python/sphinx/sphinx-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r1.ebuild,v 1.1 2012/03/31 19:55:28 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex"
-
-DEPEND=">=dev-python/docutils-0.7
- >=dev-python/jinja-2.3
- >=dev-python/pygments-1.2
- dev-python/setuptools
- latex? ( dev-texlive/texlive-latexextra )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- pushd doc > /dev/null
- einfo "Generation of documentation"
- PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed"
- popd > /dev/null
- fi
-}
-
-src_install() {
- distutils_src_install
- python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build"
-
- if use doc; then
- dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
- fi
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- # Generate the Grammar pickle to avoid sandbox violations.
- generation_of_grammar_pickle() {
- "$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
- }
- python_execute_function \
- --action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
- generation_of_grammar_pickle
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- deletion_of_grammar_pickle() {
- rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
-
- # Delete empty parent directories.
- local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
- while [[ "${dir}" != "${EROOT%/}" ]]; do
- rmdir "${dir}" 2> /dev/null || break
- dir="${dir%/*}"
- done
- }
- python_execute_function \
- --action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
- deletion_of_grammar_pickle
-}
diff --git a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
deleted file mode 100644
index 2692f2b6cd0e..000000000000
--- a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.3 2012/05/01 12:00:37 xarthisius Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-PYTHON_TESTS_RESTRICTED_ABIS="2.5 *-pypy-*"
-
-inherit distutils
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex"
-
-DEPEND=">=dev-python/docutils-0.7
- >=dev-python/jinja-2.3
- >=dev-python/pygments-1.2
- dev-python/setuptools
- latex? (
- dev-texlive/texlive-latexextra
- app-text/dvipng
- )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_prepare() {
- distutils_src_prepare
-
- prepare_tests() {
- mkdir -p build-${PYTHON_ABI}
- cp -r tests build-${PYTHON_ABI}/tests
- if [[ $(python_get_version -l --major) == "3" ]]; then
- 2to3-${PYTHON_ABI} -nw --no-diffs build-${PYTHON_ABI}/tests
- fi
- }
- use test && python_execute_function prepare_tests
-}
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- einfo "Generation of documentation"
- sed -e "/import sys/a sys.path.insert(0, '${S}/build-$(PYTHON -f --ABI)/lib')" -i sphinx-build.py
- pushd doc > /dev/null
- emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die
- popd > /dev/null
- fi
-}
-
-src_test() {
- testing() {
- pushd build-${PYTHON_ABI} > /dev/null
- echo PYTHONPATH=lib nosetests --verbosity=1
- PYTHONPATH=lib nosetests --verbosity=1
- local rv=$?
- popd > /dev/null
- return $rv
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build"
-
- delete_grammar_pickle() {
- rm -f "${ED}$(python_get_sitedir)/sphinx/pycode/Grammar$(python_get_version -l).pickle"
- }
- python_execute_function -q delete_grammar_pickle
-
- if use doc; then
- dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
- fi
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- # Generate the Grammar pickle to avoid sandbox violations.
- generation_of_grammar_pickle() {
- "$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
- }
- python_execute_function \
- --action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
- generation_of_grammar_pickle
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- deletion_of_grammar_pickle() {
- rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
-
- # Delete empty parent directories.
- local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
- while [[ "${dir}" != "${EROOT%/}" ]]; do
- rmdir "${dir}" 2> /dev/null || break
- dir="${dir%/*}"
- done
- }
- python_execute_function \
- --action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
- deletion_of_grammar_pickle
-}
diff --git a/dev-python/sphinx/sphinx-1.1.3-r6.ebuild b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
new file mode 100644
index 000000000000..a8742ebea751
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r6.ebuild,v 1.1 2013/02/06 01:04:42 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1 versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pygments-1.2[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
+DEPEND="${DEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-python3.patch
+ "${FILESDIR}"/${P}-docutils-manpage.patch
+)
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ cd "${BUILD_DIR}"/lib || die
+ "${PYTHON}" -m sphinx.pycode.__init__ \
+ || die "Grammar generation failed."
+}
+
+python_compile_all() {
+ use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+
+ if [[ ${EPYTHON} == python3* ]]; then
+ 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+ fi
+
+ nosetests -w "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.1.3-r4 ${pv}; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+pkg_preinst() {
+ if replacing_python_eclass; then
+ # the old python.eclass ebuild will want to remove our pickles...
+ backup_pickle() {
+ # array to enable filename expansion
+ local pickle_name=(
+ "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+ )
+
+ local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+ cp -p -v "${pickle_name[0]}" "${dest}" \
+ || die "Unable to backup grammar pickle from overwriting"
+ }
+
+ python_foreach_impl backup_pickle
+ fi
+}
+
+pkg_postinst() {
+ if replacing_python_eclass; then
+ restore_pickle() {
+ local backup_name=(
+ "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+ )
+ local dest=${backup_name[0]%.backup}
+
+ mv -v "${backup_name[0]}" "${dest}" \
+ || die "Unable to restore grammar pickle backup"
+ }
+
+ python_foreach_impl restore_pickle
+ fi
+}
diff --git a/dev-python/sphinx/sphinx-1.1.3.ebuild b/dev-python/sphinx/sphinx-1.1.3.ebuild
deleted file mode 100644
index 08d3a757ffa1..000000000000
--- a/dev-python/sphinx/sphinx-1.1.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3.ebuild,v 1.1 2012/03/29 08:56:46 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex"
-
-DEPEND=">=dev-python/docutils-0.7
- >=dev-python/jinja-2.3
- >=dev-python/pygments-1.2
- dev-python/setuptools
- latex? ( dev-texlive/texlive-latexextra )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- pushd doc > /dev/null
- einfo "Generation of documentation"
- PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed"
- popd > /dev/null
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
- fi
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- # Generate the Grammar pickle to avoid sandbox violations.
- generation_of_grammar_pickle() {
- "$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
- }
- python_execute_function \
- --action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
- generation_of_grammar_pickle
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- deletion_of_grammar_pickle() {
- rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
-
- # Delete empty parent directories.
- local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
- while [[ "${dir}" != "${EROOT%/}" ]]; do
- rmdir "${dir}" 2> /dev/null || break
- dir="${dir%/*}"
- done
- }
- python_execute_function \
- --action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
- --failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
- deletion_of_grammar_pickle
-}
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 94bdda92c49d..c3a2c7a15b56 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,4 +1,4 @@
DIST chicken-3.3.0.tar.gz 4228441 SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
DIST chicken-4.6.0.tar.gz 3019126 SHA256 c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245
DIST chicken-4.7.3.tar.gz 3316152 SHA256 00c82bc2208d74463a69356d2a30a3771f87048ea87fb9c024d464b3c9d4e230
-DIST chicken-4.8.0.tar.gz 3970818 SHA256 5b2e8c6b4b13b502d8c684b394d80ed490d2884c03789353d895ab85d19979ab SHA512 5ea40ca240d9d6ab9a250947288fda3cc1202b6cb689207dc603c1ca86f537f407b1c4a8020533ccfc7b48fa01d3bf8f7229f883a2a95edb3f39863d43aa6c63 WHIRLPOOL 52010977034e0661af4c692d828303ebaad8d6d2517908b2474e64c0f8840c0a8e8342577853d66c1921033926fdefa21db66857786e659d92260390e98b879f
+DIST chicken-4.8.0.1.tar.gz 3965638 SHA256 a60efa9d2a621ecb9e03b41ebdd03ae27ecb32c1292671fd969506c9baf88d0c SHA512 736f9503e29e5d36bdf17439bdf38ea8a6c0cfdcfa3ada5d49ff72d82599a9da1bccbd6f2787fcf3b85fb650161032744030f98d2f74e02b73bf7b5bfd12d3d6 WHIRLPOOL 6a0e5891f30793dc828052b03e6ed720689d5b608e4ab34216ce9f95b073ad13812a85f86facd948beb1030b22caf561ac203ac988b7c4d7764b61d3774a8fe5
diff --git a/dev-scheme/chicken/chicken-4.8.0.ebuild b/dev-scheme/chicken/chicken-4.8.0.1.ebuild
similarity index 84%
rename from dev-scheme/chicken/chicken-4.8.0.ebuild
rename to dev-scheme/chicken/chicken-4.8.0.1.ebuild
index b895ed4762e3..9f57b17fd111 100644
--- a/dev-scheme/chicken/chicken-4.8.0.ebuild
+++ b/dev-scheme/chicken/chicken-4.8.0.1.ebuild
@@ -1,28 +1,25 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.8.0.ebuild,v 1.1 2013/01/17 22:22:13 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.8.0.1.ebuild,v 1.1 2013/02/05 23:51:45 pchrist Exp $
EAPI="3"
-inherit eutils multilib
+inherit eutils multilib versionator
+MY_PV=$(get_version_component_range 1-3)
DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs parallel-build"
+IUSE="emacs parallel-build doc"
DEPEND="sys-apps/texinfo
emacs? ( virtual/emacs )"
RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
-# chicken's testsuite is not runnable before install
-# upstream has been notified of the issue
-RESTRICT=test
-
src_prepare() {
if use "parallel-build"
then
@@ -59,6 +56,10 @@ src_compile() {
fi
}
+# chicken's testsuite is not runnable before install
+# upstream has been notified of the issue
+RESTRICT=test
+
src_install() {
# still can't run make in parallel for the install target
emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
@@ -67,4 +68,10 @@ src_install() {
rm "${D}"/usr/share/doc/${P}/LICENSE || die
dodoc NEWS || die
+
+ # remove HTML documentation if the user doesn't USE=doc
+ if ! use "doc"
+ then
+ rm -rf "${D}"/usr/share/doc/${P}/manual || die
+ fi
}
diff --git a/dev-scheme/chicken/files/chicken-4.8.0-parallel-build.patch b/dev-scheme/chicken/files/chicken-4.8.0.1-parallel-build.patch
similarity index 100%
rename from dev-scheme/chicken/files/chicken-4.8.0-parallel-build.patch
rename to dev-scheme/chicken/files/chicken-4.8.0.1-parallel-build.patch
diff --git a/dev-util/dialogblocks/metadata.xml b/dev-util/dialogblocks/metadata.xml
index 0471958d536c..babe044fdaeb 100644
--- a/dev-util/dialogblocks/metadata.xml
+++ b/dev-util/dialogblocks/metadata.xml
@@ -1,12 +1,10 @@
-
- wxwidgets@gentoo.org
-
+wxwidgets
-Anthemion DialogBlocks is a sizer-based resource editor that quickly gets
-you creating professional-looking dialogs, wizards and frames for deployment
+Anthemion DialogBlocks is a sizer-based resource editor that quickly gets
+you creating professional-looking dialogs, wizards and frames for deployment
on Windows, Linux, Mac or any other supported wxWidgets platform.
diff --git a/dev-util/helpblocks/metadata.xml b/dev-util/helpblocks/metadata.xml
index 1218374e3c70..d9a3a42b8cbc 100644
--- a/dev-util/helpblocks/metadata.xml
+++ b/dev-util/helpblocks/metadata.xml
@@ -1,12 +1,10 @@
-
- wxwidgets@gentoo.org
-
+wxwidgets
-Anthemion HelpBlocks is an HTML authoring tool specifically designed for
-writing cross-platform application help, generating Microsoft HTML Help
+Anthemion HelpBlocks is an HTML authoring tool specifically designed for
+writing cross-platform application help, generating Microsoft HTML Help
and wxWidgets HTML Help files.
diff --git a/dev-util/mutrace/metadata.xml b/dev-util/mutrace/metadata.xml
index da62540a7e8f..91f4e72fb544 100644
--- a/dev-util/mutrace/metadata.xml
+++ b/dev-util/mutrace/metadata.xml
@@ -2,7 +2,6 @@
- ford_prefect@gentoo.org
- Arun Raghavan
+ maintainer-needed@gentoo.org
diff --git a/dev-util/xesam-tools/metadata.xml b/dev-util/xesam-tools/metadata.xml
index b3f1349eef10..5db1e619e0b5 100644
--- a/dev-util/xesam-tools/metadata.xml
+++ b/dev-util/xesam-tools/metadata.xml
@@ -2,8 +2,7 @@
- ford_prefect@gentoo.org
- Arun Raghavan
+ maintainer-needed@gentoo.org
xesam-tools provides a set of tools and examples to help developers
diff --git a/games-emulation/stella/stella-3.7.5.ebuild b/games-emulation/stella/stella-3.7.5.ebuild
index 55fc0045ac15..846ef8dc1e18 100644
--- a/games-emulation/stella/stella-3.7.5.ebuild
+++ b/games-emulation/stella/stella-3.7.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/games-emulation/stella/stella-3.7.5.ebuild,v 1.1 2013/01/03 03:28:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-3.7.5.ebuild,v 1.2 2013/02/05 18:02:57 nimiux Exp $
EAPI=2
inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/stella/${P}-src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="joystick opengl"
DEPEND="media-libs/libsdl[joystick?,opengl?,video]
diff --git a/gnome-extra/connman-gnome/Manifest b/gnome-extra/connman-gnome/Manifest
index 78268360a841..c6c3d00e1f56 100644
--- a/gnome-extra/connman-gnome/Manifest
+++ b/gnome-extra/connman-gnome/Manifest
@@ -1 +1 @@
-DIST connman-gnome-0.5.tar.gz 194674 RMD160 4bffd09ac3f9cb93aec43d4a185f3292e981a8ed SHA1 8a1248ae22339c5795d056eecc4f03adb0978467 SHA256 4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c
+DIST connman-gnome-0.5.tar.gz 194674 SHA256 4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c
diff --git a/gnome-extra/connman-gnome/metadata.xml b/gnome-extra/connman-gnome/metadata.xml
index 37bb40d2024d..46db27f9fd86 100644
--- a/gnome-extra/connman-gnome/metadata.xml
+++ b/gnome-extra/connman-gnome/metadata.xml
@@ -2,7 +2,6 @@
- dagger@gentoo.org
- Robert Piasek
+ maintainer-needed@gentoo.org
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 6303836dbef0..487f2b60f4e7 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,2 @@
-DIST yelp-xsl-3.2.1.tar.xz 556512 SHA256 76159759ccff4003c13a9fd14de82f334978165f88dd3716efa98382285a06a6 SHA512 08f94c8e5668aaa1f2e9c01d699aeccf644631d238574b0de295d0813368e05434abeef126e8dca3a01029beb5f09947a56c3b6402e31f90ca2ad4441910bc66 WHIRLPOOL 9982d8b389b711ce49a57918336cca6bfe983293dd868cdb37b5005d71782de7c21fd9eeef80d710d5ad437409eb5be61401003354cd47b4fa0f0b8a6d56361a
DIST yelp-xsl-3.4.2.tar.xz 585248 SHA256 421b622da421f310add15c9d0cf23f3d66c3e0847292f45341e2f6b2db326325 SHA512 31a662ba0ba20871f89a26c254c3f13030541f592901913f76d1c0010148ad84a809cbd0c7335fa1ba534c5d6da64bca49ea1b79775c927107c21425a7fb77b9 WHIRLPOOL 388515bfbd9dc6910c57452e92b28d747278ad0e47a4356aef6821e4fab0c46fc510a98b03ad5a7c885cf53ebf76f5006b188a306cd000b6c286158d81f8db3e
DIST yelp-xsl-3.6.1.tar.xz 589500 SHA256 9cac9770d6ace354f3e56a2e60933bb0cd894a4263a3bf1db6e8900f86f8cdd6 SHA512 8c097361d1f238b02d750e702f4eb72d56630e71b168634f4cabbfa9724719fced9b582c6c2e693b94f9045ec00313478b04e8d7a1f3fc87fd7ad140f7e5847a WHIRLPOOL 15e90968cf321ae8ca5f9acc6e1407f6b15a3d17b779ffdbe0380c4b5905870b3e3917f46e4a87ac19c07eccd105f1513e3f0041932af25d68abc9abc6c53475
diff --git a/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch b/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
new file mode 100644
index 000000000000..9f06c436050c
--- /dev/null
+++ b/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
@@ -0,0 +1,59 @@
+From 7dfe59cd3ed75a245804ea3081460988c4affdee Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev
+Date: Tue, 5 Feb 2013 22:41:14 -0500
+Subject: [PATCH] Use gawk, not awk
+
+Despite all attempts to be compatible with other awks, using some (e.g.
+nawk) still results in syntax errors:
+
+nawk: syntax error at source line 3 source file
+doc/yelp-xsl/xsldoc-scan.awk
+ context is
+ # -*- indent-tabs-mode: nil -*- >>>
+ <<<
+ 2 extra }'s
+---
+ doc/yelp-xsl/mal2cache | 2 +-
+ doc/yelp-xsl/xsldoc-scan | 2 +-
+ doc/yelp-xsl/xsldoc-scan.awk | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/yelp-xsl/mal2cache b/doc/yelp-xsl/mal2cache
+index a7a23ee..6beaa64 100755
+--- a/doc/yelp-xsl/mal2cache
++++ b/doc/yelp-xsl/mal2cache
+@@ -2,7 +2,7 @@
+ # -*- indent-tabs-mode: nil -*-
+ export LANG=C
+ urlencode() {
+- echo "$1" | awk --posix '
++ echo "$1" | gawk --posix '
+ BEGIN {
+ for (i = 1; i <= 256; i++) {
+ bytes[sprintf("%c", i)] = i;
+diff --git a/doc/yelp-xsl/xsldoc-scan b/doc/yelp-xsl/xsldoc-scan
+index 63e713b..892bb3a 100755
+--- a/doc/yelp-xsl/xsldoc-scan
++++ b/doc/yelp-xsl/xsldoc-scan
+@@ -9,7 +9,7 @@ while [ "$#" != "0" ]; do
+ else
+ fullfile=$(cd $(dirname "$1") && pwd)/$(basename "$1")
+ outfile=$(basename "$1" .xsl)
+- awk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
++ gawk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
+ xsltproc -o "$outdir/$outfile".page \
+ --stringparam xsldoc.id "$outfile" \
+ --stringparam xsldoc.xslt_file "$fullfile" \
+diff --git a/doc/yelp-xsl/xsldoc-scan.awk b/doc/yelp-xsl/xsldoc-scan.awk
+index a8859df..83e976a 100644
+--- a/doc/yelp-xsl/xsldoc-scan.awk
++++ b/doc/yelp-xsl/xsldoc-scan.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk
++#!/usr/bin/env gawk
+ # -*- indent-tabs-mode: nil -*-
+ # xsldoc.awk - Convert inline documentation to XML suitable for xsldoc.xsl
+ # Copyright (C) 2006 Shaun McCance
+--
+1.8.1.2
+
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
deleted file mode 100644
index fc6418d8e32b..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild,v 1.5 2012/12/16 10:12:24 tetromino Exp $
-
-EAPI="4"
-
-inherit gnome.org
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.12
- >=dev-libs/libxslt-1.1.8"
-DEPEND="${RDEPEND}
- sys-apps/gawk
- sys-devel/gettext
- >=dev-util/intltool-0.40
- dev-util/itstool
- virtual/pkgconfig"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
index d082126057ad..c902e6f650b9 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.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/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.7 2012/12/19 15:54:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.8 2013/02/06 03:52:06 tetromino Exp $
EAPI="4"
-inherit gnome.org
+inherit eutils gnome.org
DESCRIPTION="XSL stylesheets for yelp"
HOMEPAGE="http://www.gnome.org/"
@@ -16,9 +16,16 @@ IUSE=""
RDEPEND=">=dev-libs/libxml2-2.6.12
>=dev-libs/libxslt-1.1.8"
+# Requires gawk, not virtual/awk: nawk fails with syntax errors
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
dev-util/itstool
sys-apps/gawk
sys-devel/gettext
virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
+ sed -e 's/$(YELP_XSL_AWK)/gawk/' -i doc/yelp-xsl/Makefile.{am,in} || die
+ default
+}
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
index 3c73079579b5..4c8b6a275d80 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.9 2013/01/28 13:48:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.10 2013/02/06 03:52:06 tetromino Exp $
EAPI="5"
-inherit gnome.org
+inherit eutils gnome.org
DESCRIPTION="XSL stylesheets for yelp"
HOMEPAGE="http://www.gnome.org/"
@@ -16,9 +16,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb
RDEPEND=">=dev-libs/libxml2-2.6.12
>=dev-libs/libxslt-1.1.8"
+# Requires gawk, not virtual/awk: nawk fails with syntax errors
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
dev-util/itstool
sys-apps/gawk
sys-devel/gettext
virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
+ sed -e 's/$(YELP_XSL_AWK)/gawk/' -i doc/yelp-xsl/Makefile.{am,in} || die
+ default
+}
diff --git a/licenses/Caldera b/licenses/Caldera
deleted file mode 100644
index 27232a3fa70f..000000000000
--- a/licenses/Caldera
+++ /dev/null
@@ -1,109 +0,0 @@
-This code contains changes by
- Gunnar Ritter, Freiburg i. Br., Germany, 2002. All rights reserved.
-
-Conditions 1, 2, and 4 and the no-warranty notice below apply
-to these changes.
-
-Copyright (c) 1980, 1993
- The Regents of the University of California. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-Copyright(C) Caldera International Inc. 2001-2002. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- Redistributions of source code and documentation must retain the
- above copyright notice, this list of conditions and the following
- disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed or owned by Caldera
- International, Inc.
- Neither the name of Caldera International, Inc. nor the names of
- other contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
-INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE
-LIABLE FOR ANY DIRECT, INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The mmap-based memory allocation code is derived from mm-1.1.3:
-
-Copyright (c) 1999-2000 Ralf S. Engelschall. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-3. All advertising materials mentioning features or use of this
- software must display the following acknowledgment:
- "This product includes software developed by
- Ralf S. Engelschall ."
-
-4. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by
- Ralf S. Engelschall ."
-
-THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RALF S. ENGELSCHALL OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/buddy b/licenses/buddy
new file mode 100644
index 000000000000..fe750b2e3269
--- /dev/null
+++ b/licenses/buddy
@@ -0,0 +1,26 @@
+ Copyright (C) 1996-2002 by Jorn Lind-Nielsen
+ All rights reserved
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, reproduce, prepare derivative
+works, distribute, and display this software and its documentation
+for any purpose, provided that (1) the above copyright notice and
+the following two paragraphs appear in all copies of the source code
+and (2) redistributions, including without limitation binaries,
+reproduce these notices in the supporting documentation. Substantial
+modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided
+that the new terms are clearly indicated in all files where they apply.
+
+IN NO EVENT SHALL JORN LIND-NIELSEN, OR DISTRIBUTORS OF THIS
+SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS
+SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE AUTHORS OR ANY OF THE
+ABOVE PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+JORN LIND-NIELSEN SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO
+OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
diff --git a/licenses/ipx-utils b/licenses/ipx-utils
new file mode 100644
index 000000000000..56f79a1f9430
--- /dev/null
+++ b/licenses/ipx-utils
@@ -0,0 +1,8 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the original work is
+properly attributed to Greg Page and Caldera, Inc.
+Neither the name of Greg Page nor Caldera, Inc. may be used to
+endorse or promote products derived from this software without
+specific prior written permission.
+This software is provided by Greg Page and Caldera, Inc. "AS IS"
+and without any express or implied warranties.
diff --git a/licenses/minpack b/licenses/minpack
new file mode 100644
index 000000000000..132cc3f33fa7
--- /dev/null
+++ b/licenses/minpack
@@ -0,0 +1,51 @@
+Minpack Copyright Notice (1999) University of Chicago. All rights reserved
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer.
+
+2. Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+3. The end-user documentation included with the
+redistribution, if any, must include the following
+acknowledgment:
+
+ "This product includes software developed by the
+ University of Chicago, as Operator of Argonne National
+ Laboratory.
+
+Alternately, this acknowledgment may appear in the software
+itself, if and wherever such third-party acknowledgments
+normally appear.
+
+4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
+WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
+UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
+THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
+OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
+OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
+THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
+DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
+UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
+BE CORRECTED.
+
+5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
+HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
+ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
+INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
+ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
+PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
+SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
+(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
+POSSIBILITY OF SUCH LOSS OR DAMAGES.
diff --git a/licenses/shrimp b/licenses/shrimp
new file mode 100644
index 000000000000..be557939051a
--- /dev/null
+++ b/licenses/shrimp
@@ -0,0 +1,18 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that neither the name of Stephen
+M. Rumble nor the names of any contributors are used to endorse or
+promote products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/licenses/tm-align b/licenses/tm-align
new file mode 100644
index 000000000000..9c86a443f259
--- /dev/null
+++ b/licenses/tm-align
@@ -0,0 +1,39 @@
+TMalign.f:
+
+This program is to identify the best alignment of two protein
+structures that gives the highest TM-score. Input structures must
+be in the PDB format. By default, TM-score is normalized by the
+second protein. Users can obtain a brief instruction by simply
+running the program without arguments. For comments/suggestions,
+please contact email: zhng@umich.edu.
+
+Reference to cite:
+Yang Zhang, Jeffrey Skolnick, Nucl. Acid Res. 2005 33: 2303-9
+
+Permission to use, copy, modify, and distribute this program for
+any purpose, with or without fee, is hereby granted, provided that
+the notices on the head, the reference information, and this
+copyright notice appear in all copies or substantial portions of
+the Software. It is provided "as is" without express or implied
+warranty.
+
+---
+
+TMscore.f:
+
+This program is to compare two protein structures and identify the
+best superposition that has the highest TM-score. Input structures
+must be in the PDB format. By default, TM-score is normalized by
+the second protein. Users can obtain a brief instruction by simply
+running the program without arguments. For comments/suggestions,
+please contact email: zhng@umich.edu.
+
+Reference:
+Yang Zhang, Jeffrey Skolnick, Proteins, 2004 57:702-10.
+
+Permission to use, copy, modify, and distribute this program for
+any purpose, with or without fee, is hereby granted, provided that
+the notices on the head, the reference information, and this
+copyright notice appear in all copies or substantial portions of
+the Software. It is provided "as is" without express or implied
+warranty.
diff --git a/media-fonts/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index ecf14b6333f5..ce53bb7307f9 100644
--- a/media-fonts/ipamonafont/Manifest
+++ b/media-fonts/ipamonafont/Manifest
@@ -1 +1 @@
-DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 RMD160 f9abd1af544923ec38c2ba0cd797d73adc1eceab SHA1 57dd13ab58c0005d3ee2932539e4987ab0242bc7 SHA256 ab77beea3b051abf606cd8cd3badf6cb24141ef145c60f508fcfef1e3852bb9d
+DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 SHA256 ab77beea3b051abf606cd8cd3badf6cb24141ef145c60f508fcfef1e3852bb9d
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index e29e51921f29..02ef53a5d603 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild,v 1.7 2009/02/07 14:41:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild,v 1.8 2013/02/05 17:55:03 ulm Exp $
inherit font
@@ -8,8 +8,8 @@ DESCRIPTION="Hacked version of IPA fonts, which is suitable for browsing 2ch"
HOMEPAGE="http://www.geocities.jp/ipa_mona/index.html"
MY_PN="opfc-ModuleHP-1.1.1_withIPAMonaFonts"
SRC_URI="http://www.geocities.jp/ipa_mona/${MY_PN}-${PV}.tar.gz"
-LICENSE="grass-ipafonts as-is"
+LICENSE="grass-ipafonts mplus-fonts public-domain"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
IUSE=""
diff --git a/media-fonts/sazanami/Manifest b/media-fonts/sazanami/Manifest
index 6a5596863ffe..b5067a77e4f5 100644
--- a/media-fonts/sazanami/Manifest
+++ b/media-fonts/sazanami/Manifest
@@ -1 +1 @@
-DIST sazanami-20040629.tar.bz2 8622710 RMD160 97a8fb0edb7045928d886c81ac09fc94048a749a SHA1 a6e558f49de8ab9884d92327905ce45698ca5429 SHA256 3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
+DIST sazanami-20040629.tar.bz2 8622710 SHA256 3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 12c5614421b7..8d45b8a84007 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -1,6 +1,6 @@
-# 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-fonts/sazanami/sazanami-20040629.ebuild,v 1.14 2010/02/02 16:58:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sazanami/sazanami-20040629.ebuild,v 1.15 2013/02/05 17:50:40 ulm Exp $
inherit font
@@ -8,9 +8,7 @@ DESCRIPTION="Sazanami Japanese TrueType fonts"
HOMEPAGE="http://efont.sourceforge.jp/"
SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
-# oradano, misaki, mplus -> as-is
-# shinonome, ayu, kappa -> public-domain
-LICENSE="as-is public-domain"
+LICENSE="mplus-fonts public-domain" #446166
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 663e1a3a3e95..86e908ab621b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,2 @@
-DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488 SHA512 0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460 WHIRLPOOL d8b54b39eb47841c7e93157726f55c855d0930b89e4cbe8f093dcd7110978ed267ca96517281861bd6d62c1108a8068c5a863452d3208b1f4ad3d374f1e74f7d
DIST blender-2.64a-patches-1.tar.xz 14388 SHA256 047f3231f4b21dd813e7b052be0b28b9391345422fb335d4cca578820977bc8b SHA512 f0dc73769a74ca9098380640ae28508b204f4c198a97219bb2ac8445eff6120dbda64a9d2d80e5dcab48df34d7de844489702510b5a8d32677b5cb8e70c7b4d9 WHIRLPOOL e8bfaf0ca1a51991e3109a51068bea2619da7d3a93bba623d78f67f98681c43ad7dc3a1452fd13929081b3a118ae6a35ff07994251c857e3b6d35aabcd4b732e
DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
deleted file mode 100644
index df768b360f19..000000000000
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.19 2013/01/17 16:52:21 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.6"
-
-inherit scons-utils multilib eutils python
-
-IUSE="blender-game ffmpeg nls ogg openmp verse openal"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL BSD )"
-KEYWORDS="amd64 x86"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
- >=media-libs/openjpeg-1.5.0
- media-libs/tiff:0
- nls? ( >=media-libs/freetype-2.0
- virtual/libintl
- >=media-libs/ftgl-2.1 )
- openal? ( >=media-libs/openal-1.6.372
- >=media-libs/freealut-1.1.0-r1 )
- media-libs/openexr
- media-libs/libpng:0
- blender-game? ( >=media-libs/libsdl-1.2[joystick] )
- >=media-libs/libsdl-1.2
- ogg? ( media-libs/libogg )
- virtual/jpeg
- virtual/opengl"
-DEPEND=">=dev-util/scons-2
- sys-devel/gcc[openmp?]
- x11-base/xorg-server
- ${RDEPEND}"
-
-blend_with() {
- local UWORD="$2"
- if [ -z "${UWORD}" ]; then
- UWORD="$1"
- fi
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
- epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
- epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
- epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
- epatch "${FILESDIR}"/${PN}-2.49b-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${PN}-2.49b-linux-3.patch # Bug #381099
- epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch
- epatch "${FILESDIR}"/${P}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-gcc46.patch
- rm -f "${S}/release/scripts/bpymodules/"*.pyc
-
- # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
- sed -i \
- -e '/parameters.*tile_size_on/s:false:FALSE:' \
- source/blender/imbuf/intern/jp2.c || die
-}
-
-src_configure() {
-
- # add ffmpeg info to the scons build info
- cat <<- EOF >> "${S}"/user-config.py
- BF_FFMPEG="/usr"
- BF_FFMPEG_LIB="avdevice avformat avcodec swscale avutil"
- EOF
-
- # set python version to current version in use
- cat <<- EOF >> "${S}"/user-config.py
- BF_PYTHON_VERSION="$(python_get_version)"
- BF_PYTHON_INC="$(python_get_includedir)"
- BF_PYTHON_BINARY="$(PYTHON -a)"
- BF_PYTHON_LIB="python$(python_get_version)"
- EOF
-
- # add system openjpeg into scons build.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG = "/usr"
- BF_OPENJPEG_INC = "/usr/include"
- BF_OPENJPEG_LIB = "openjpeg"
- EOF
-
- #set CFLAGS used in /etc/make.conf correctly
-
- echo "CFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- echo "CXXFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`]" \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # check for blender-game USE flag.
- # blender-game will merge with blenderplayer.
-
- for arg in \
- 'openal'\
- 'ffmpeg' \
- 'blender-game player' \
- 'blender-game gameengine' \
- 'nls international' \
- 'ogg' \
- 'openmp' \
- 'verse' ; do
- blend_with ${arg}
- done
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-
- cd "${WORKDIR}"/install/linux2/plugins
- chmod 755 bmake
- emake || die
-}
-
-src_install() {
- exeinto /usr/bin/
- doexe "${WORKDIR}"/install/linux2/blender
- use blender-game && doexe "${WORKDIR}"/install/linux2/blenderplayer
-
- dodir /usr/share/${PN}
-
- exeinto /usr/$(get_libdir)/${PN}/textures
- doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
- exeinto /usr/$(get_libdir)/${PN}/sequences
- doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
- insinto /usr/include/${PN}
- doins "${WORKDIR}"/install/linux2/plugins/include/*.h
-
- if use nls ; then
- mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
- "${D}"/usr/share/${PN}
- mv "${WORKDIR}"/install/linux2/.blender/locale \
- "${D}"/usr/share/locale
- fi
-
- mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
-
- insinto /usr/share/pixmaps
- doins "${WORKDIR}"/install/linux2/icons/scalable/blender.svg
- domenu "${FILESDIR}"/${PN}.desktop || die
- domenu "${FILESDIR}"/${P}-insecure.desktop || die
-
- dodoc INSTALL README
- dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
-
-}
-
-pkg_preinst(){
- if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
- then
- rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
- fi
-}
-
-pkg_postinst(){
- elog "blender uses python integration. As such, may have some"
- elog "inherit risks with running unknown python scripting."
- elog " "
- elog "CVE-2008-1103-1.patch has been removed as it interferes"
- elog "with autosave undo features. Up stream blender coders"
- elog "have not addressed the CVE issue as the status is still"
- elog "a CANDIDATE and not CONFIRMED."
- elog " "
- elog "It is recommended to change your blender temp directory"
- elog "from /tmp to ~tmp or another tmp file under your home"
- elog "directory. This can be done by starting blender, then"
- elog "dragging the main menu down do display all paths."
-}
diff --git a/media-gfx/blender/files/blender-2.37-dirs.patch b/media-gfx/blender/files/blender-2.37-dirs.patch
deleted file mode 100644
index 1b6837fa70e8..000000000000
--- a/media-gfx/blender/files/blender-2.37-dirs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN blender.orig/source/blender/src/language.c blender/source/blender/src/language.c
---- blender.orig/source/blender/src/language.c 2005-06-01 10:59:36.000000000 +0200
-+++ blender/source/blender/src/language.c 2005-06-01 11:07:15.000000000 +0200
-@@ -358,9 +358,9 @@
- strcpy(name, bundlePath);
- strcat(name, "/Contents/Resources/.Blanguages");
- #else
-- /* Check the CWD. Takes care of the case where users
-- * unpack blender tarball; cd blender-dir; ./blender */
-- strcpy(name, ".blender/.Blanguages");
-+ /* Check the standar location. Takes care of the case
-+ * in which the distribution installs blender */
-+ strcpy(name, "/usr/share/blender/.Blanguages");
- #endif
- lines= BLI_read_file_as_lines(name);
-
diff --git a/media-gfx/blender/files/blender-2.44-scriptsdir.patch b/media-gfx/blender/files/blender-2.44-scriptsdir.patch
deleted file mode 100644
index 398ccc5e9a91..000000000000
--- a/media-gfx/blender/files/blender-2.44-scriptsdir.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- blender-2.44/source/blender/python/api2_2x/EXPP_interface.c.orig 2006-05-01 14:24:56.000000000 +0200
-+++ blender-2.44/source/blender/python/api2_2x/EXPP_interface.c 2007-06-21 22:25:39.000000000 +0200
-@@ -52,85 +52,13 @@
- */
- char *bpy_gethome(int append_scriptsdir)
- {
-- static char homedir[FILE_MAXDIR];
-- static char scriptsdir[FILE_MAXDIR];
-- char tmpdir[FILE_MAXDIR];
-- char bprogdir[FILE_MAXDIR];
-- char *s;
-- int i;
-+ static char homedir[FILE_MAXDIR]="/usr/share/blender";
-+ static char scriptsdir[FILE_MAXDIR]="/usr/share/blender/scripts";
-
- if (append_scriptsdir) {
-- if (scriptsdir[0] != '\0')
- return scriptsdir;
- }
-- else if (homedir[0] != '\0')
-- return homedir;
--
-- /* BLI_gethome() can return NULL if env vars are not set */
-- s = BLI_gethome();
--
-- if( !s ) /* bail if no $HOME */
-- {
-- printf("$HOME is NOT set\n");
-- return NULL;
-- }
--
-- if( strstr( s, ".blender" ) )
-- PyOS_snprintf( homedir, FILE_MAXDIR, s );
-- else
-- BLI_make_file_string( "/", homedir, s, ".blender" );
--
-- /* if userhome/.blender/ exists, return it */
-- if( BLI_exists( homedir ) ) {
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, homedir, "scripts");
-- if (BLI_exists (scriptsdir)) return scriptsdir;
-- }
-- else return homedir;
-- }
-- else homedir[0] = '\0';
--
-- /* if either:
-- * no homedir was found or
-- * append_scriptsdir = 1 but there's no scripts/ inside homedir,
-- * use argv[0] (bprogname) to get .blender/ in
-- * Blender's installation dir */
-- s = BLI_last_slash( bprogname );
--
-- i = s - bprogname + 1;
--
-- PyOS_snprintf( bprogdir, i, "%s", bprogname );
--
-- /* using tmpdir to preserve homedir (if) found above:
-- * the ideal is to have a home dir with scripts dir inside
-- * it, but if that isn't available, it's possible to
-- * have a 'broken' home dir somewhere and a scripts dir in the
-- * cvs sources */
-- BLI_make_file_string( "/", tmpdir, bprogdir, ".blender" );
--
-- if (BLI_exists(tmpdir)) {
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, tmpdir, "scripts");
-- if (BLI_exists(scriptsdir)) {
-- PyOS_snprintf(homedir, FILE_MAXDIR, "%s", tmpdir);
-- return scriptsdir;
-- }
-- else {
-- homedir[0] = '\0';
-- scriptsdir[0] = '\0';
-- }
-- }
-- else return homedir;
-- }
--
-- /* last try for scripts dir: blender in cvs dir, scripts/ inside release/: */
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, bprogdir, "release/scripts");
-- if (BLI_exists(scriptsdir)) return scriptsdir;
-- else scriptsdir[0] = '\0';
-- }
--
-- return NULL;
-+ return homedir;
- }
-
- /* PyDrivers */
diff --git a/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch b/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch
deleted file mode 100644
index 3162a0d8a840..000000000000
--- a/media-gfx/blender/files/blender-2.48a-CVE-2008-4863.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up blender-2.48a/source/blender/python/BPY_interface.c.cve blender-2.48a/source/blender/python/BPY_interface.c
---- blender-2.48a/source/blender/python/BPY_interface.c.cve 2008-11-03 17:31:19.000000000 +0100
-+++ blender-2.48a/source/blender/python/BPY_interface.c 2008-11-03 17:35:01.000000000 +0100
-@@ -225,6 +225,11 @@ void BPY_start_python( int argc, char **
- Py_Initialize( );
-
- PySys_SetArgv( argc_copy, argv_copy );
-+
-+ /* Sanitize sys.path to prevent relative imports loading modules in
-+ the current working directory */
-+ PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
-+
- /* Initialize thread support (also acquires lock) */
- PyEval_InitThreads();
-
diff --git a/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch b/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch
deleted file mode 100644
index a9e46ea3497a..000000000000
--- a/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blender/tools/Blender.py.orig 2009-06-16 14:57:16.000000000 +0200
-+++ blender/tools/Blender.py 2009-07-02 15:53:49.000000000 +0200
-@@ -170,6 +170,8 @@
- if lenv['WITH_BF_OPENAL']:
- if not lenv['WITH_BF_STATICOPENAL']:
- syslibs += Split(lenv['BF_OPENAL_LIB'])
-+ if lenv['WITH_BF_OPENJPEG']:
-+ syslibs += Split(lenv['BF_OPENJPEG_LIB'])
- if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
- if lenv['CC'] == 'cl.exe':
- syslibs += ['vcomp']
diff --git a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v4.patch b/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v4.patch
deleted file mode 100644
index 93498791caee..000000000000
--- a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v4.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From f3a8d00d03cc8bdf1739936998a784c9e4e64bb9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping
-Date: Sun, 24 Apr 2011 00:00:36 +0200
-Subject: [PATCH] Disable execution of embedded Python code unless run with
- -666 (CVE-2009-3850)
-
----
- source/blender/blenkernel/intern/blender.c | 11 ++++++++++-
- source/blender/python/api2_2x/sceneRender.c | 3 ++-
- source/blender/src/buttons_script.c | 4 +++-
- source/creator/creator.c | 18 ++++++++++++++----
- 4 files changed, 29 insertions(+), 7 deletions(-)
-
-diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
-index bf208c8..029b7cf 100644
---- a/source/blender/blenkernel/intern/blender.c
-+++ b/source/blender/blenkernel/intern/blender.c
-@@ -388,7 +388,16 @@ static void setup_app_data(BlendFileData *bfd, char *filename)
- if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG;
- else bfd->globalf &= ~G_DEBUG;
-
-- if ((U.flag & USER_DONT_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS;
-+ if (G.f & G_DOSCRIPTLINKS) {
-+ /* Blender running in -666 mode */
-+ /* NOTE: In background mode U.flag has not been initialized from ~/.B.blend */
-+ if (! G.background && (U.flag & USER_DONT_DOSCRIPTLINKS))
-+ /* Prefer disabled "Auto Run Python Scripts" over -666 */
-+ bfd->globalf &= ~G_DOSCRIPTLINKS;
-+ } else {
-+ /* Blender NOT running in -666 mode, deny pulling G_DOSCRIPTLINKS in */
-+ bfd->globalf &= ~G_DOSCRIPTLINKS;
-+ }
-
- G.f= bfd->globalf;
-
-diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
-index 1bf2b75..e34a361 100644
---- a/source/blender/python/api2_2x/sceneRender.c
-+++ b/source/blender/python/api2_2x/sceneRender.c
-@@ -498,7 +498,8 @@ static PyObject *RenderData_Render( BPy_RenderData * self )
-
- RE_BlenderFrame(re, G.scene, G.scene->r.cfra);
-
-- BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
-+ if (G.f & G_DOSCRIPTLINKS)
-+ BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
-
- set_scene_bg( oldsce );
- }
-diff --git a/source/blender/src/buttons_script.c b/source/blender/src/buttons_script.c
-index 647fc66..6166133 100644
---- a/source/blender/src/buttons_script.c
-+++ b/source/blender/src/buttons_script.c
-@@ -107,6 +107,8 @@
- #include "blendef.h"
- #include "butspace.h"
-
-+extern int button_enable_script_links_enabled;
-+
- /* ************************ function prototypes ********************** */
- void draw_scriptlink(uiBlock *, ScriptLink *, int , int , int ) ;
-
-@@ -323,7 +325,7 @@ static void script_panel_scriptlink(void)
- block= uiNewBlock(&curarea->uiblocks, "script_panel_scriptlink", UI_EMBOSS, UI_HELV, curarea->win);
- if(uiNewPanel(curarea, block, "Scriptlinks", "Script", 0, 0, 318, 204)==0) return;
-
-- uiDefButBitI(block, TOG, G_DOSCRIPTLINKS, REDRAWBUTSSCRIPT,
-+ uiDefButBitI(block, button_enable_script_links_enabled ? TOG : BUT, G_DOSCRIPTLINKS, REDRAWBUTSSCRIPT,
- "Enable Script Links", xco, 200, 150, 20, &G.f, 0, 0, 0, 0,
- "Enable execution of all assigned Script links and Space Handelers");
- /* for proper alignment: */
-diff --git a/source/creator/creator.c b/source/creator/creator.c
-index a562fc3..ccea569 100644
---- a/source/creator/creator.c
-+++ b/source/creator/creator.c
-@@ -108,6 +108,8 @@
- #include "binreloc.h"
- #endif
-
-+int button_enable_script_links_enabled = 0;
-+
- // from buildinfo.c
- #ifdef BUILD_DATE
- extern char * build_date;
-@@ -232,7 +234,8 @@ static void print_help(void)
- printf (" -nojoystick\tDisable joystick support\n");
- printf (" -noglsl\tDisable GLSL shading\n");
- printf (" -h\t\tPrint this help text\n");
-- printf (" -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
-+ printf (" -666\t\tEnables automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
-+ printf (" -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes) (default)\n");
- printf (" -P \tRun the given Python script (filename or Blender Text)\n");
- #ifdef WIN32
- printf (" -R\t\tRegister .blend extension\n");
-@@ -366,7 +369,7 @@ int main(int argc, char **argv)
-
- /* first test for background */
-
-- G.f |= G_DOSCRIPTLINKS; /* script links enabled by default */
-+ G.f &= ~G_DOSCRIPTLINKS; /* script links disabled by default */
-
- for(a=1; aframe_step);
- #ifndef DISABLE_PYTHON
-- BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
-+ if (G.f & G_DOSCRIPTLINKS)
-+ BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
- #endif
- }
- } else {
---
-1.7.5.rc1
-
diff --git a/media-gfx/blender/files/blender-2.49b-gcc46.patch b/media-gfx/blender/files/blender-2.49b-gcc46.patch
deleted file mode 100644
index 195ca0c24b99..000000000000
--- a/media-gfx/blender/files/blender-2.49b-gcc46.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.gentoo.org/452694
-
---- extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
-+++ extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
-@@ -18,6 +18,7 @@
- #define _BT_SOFT_BODY_INTERNALS_H
-
- #include "btSoftBody.h"
-+#include
-
- #include "LinearMath/btQuickprof.h"
- #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
-@@ -171,8 +172,7 @@
- template
- static inline void ZeroInitialize(T& value)
- {
-- static const T zerodummy;
-- value=zerodummy;
-+ memset(&value,0,sizeof(T));
- }
- //
- template
---- intern/memutil/MEM_Allocator.h
-+++ intern/memutil/MEM_Allocator.h
-@@ -24,6 +24,7 @@
- #ifndef __MEM_Allocator_h_included__
- #define __MEM_Allocator_h_included__ 1
-
-+#include
- #include "guardedalloc/MEM_guardedalloc.h"
- #include "guardedalloc/BLO_sys_types.h"
-
diff --git a/media-gfx/blender/files/blender-2.49b-insecure.desktop b/media-gfx/blender/files/blender-2.49b-insecure.desktop
deleted file mode 100644
index 6b36a0aff50c..000000000000
--- a/media-gfx/blender/files/blender-2.49b-insecure.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender 2.4x (reduced security)
-Comment=3D modeling, animation, rendering and post-production.
-Exec=blender -666
-Icon=blender
-Terminal=0
-Type=Application
-Categories=Graphics;Application;
diff --git a/media-gfx/blender/files/blender-2.49b-libav-0.7.patch b/media-gfx/blender/files/blender-2.49b-libav-0.7.patch
deleted file mode 100644
index d0661add703c..000000000000
--- a/media-gfx/blender/files/blender-2.49b-libav-0.7.patch
+++ /dev/null
@@ -1,425 +0,0 @@
-diff -urN blender-2.49b.orig//source/blender/blenkernel/intern/writeffmpeg.c blender-2.49b/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.49b.orig//source/blender/blenkernel/intern/writeffmpeg.c 2009-09-01 17:21:17.000000000 +0200
-+++ blender-2.49b/source/blender/blenkernel/intern/writeffmpeg.c 2011-11-13 05:36:23.000000000 +0100
-@@ -32,6 +32,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
-
-@@ -149,10 +150,9 @@
- #else
- pkt.pts = c->coded_frame->pts;
- #endif
-- fprintf(stderr, "Audio Frame PTS: %lld\n", pkt.pts);
-
- pkt.stream_index = audio_stream->index;
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- if (av_interleaved_write_frame(outfile, &pkt) != 0) {
- error("Error writing audio packet");
- return -1;
-@@ -271,7 +271,7 @@
- fprintf(stderr, "Video Frame PTS: not set\n");
- }
- if (c->coded_frame->key_frame)
-- packet.flags |= PKT_FLAG_KEY;
-+ packet.flags |= AV_PKT_FLAG_KEY;
- packet.stream_index = video_stream->index;
- packet.data = video_buffer;
- packet.size = outsize;
-@@ -373,7 +373,7 @@
- switch(prop->type) {
- case IDP_STRING:
- fprintf(stderr, "%s.\n", IDP_String(prop));
-- rv = av_set_string(c, prop->name, IDP_String(prop));
-+ av_set_string3(c, prop->name, IDP_String(prop), 0, &rv);
- break;
- case IDP_FLOAT:
- fprintf(stderr, "%g.\n", IDP_Float(prop));
-@@ -384,12 +384,12 @@
-
- if (param) {
- if (IDP_Int(prop)) {
-- rv = av_set_string(c, name, param);
-+ av_set_string3(c, name, param, 0, &rv);
- } else {
- return;
- }
- } else {
-- rv = av_set_int(c, prop->name, IDP_Int(prop));
-+ av_set_int(c, prop->name, IDP_Int(prop));
- }
- break;
- }
-@@ -438,7 +438,7 @@
-
- c = get_codec_from_stream(st);
- c->codec_id = codec_id;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
-
-
- /* Get some values from the current render settings */
-@@ -496,7 +496,7 @@
- c->pix_fmt = PIX_FMT_YUV422P;
- }
-
-- if (codec_id == CODEC_ID_XVID) {
-+ if (codec_id == CODEC_ID_MPEG4) {
- /* arghhhh ... */
- c->pix_fmt = PIX_FMT_YUV420P;
- }
-@@ -557,7 +557,7 @@
-
- c = get_codec_from_stream(st);
- c->codec_id = codec_id;
-- c->codec_type = CODEC_TYPE_AUDIO;
-+ c->codec_type = AVMEDIA_TYPE_AUDIO;
-
- c->sample_rate = G.scene->audio.mixrate;
- c->bit_rate = ffmpeg_audio_bitrate*1000;
-@@ -652,14 +652,14 @@
- error("No valid formats found");
- return;
- }
-- fmt = guess_format(NULL, exts[0], NULL);
-+ fmt = av_guess_format(NULL, exts[0], NULL);
- if (!fmt) {
- G.afbreek = 1; /* Abort render */
- error("No valid formats found");
- return;
- }
-
-- of = av_alloc_format_context();
-+ of = avformat_alloc_context();
- if (!of) {
- G.afbreek = 1;
- error("Error opening output file");
-@@ -699,7 +699,7 @@
- fmt->video_codec = CODEC_ID_H264;
- break;
- case FFMPEG_XVID:
-- fmt->video_codec = CODEC_ID_XVID;
-+ fmt->video_codec = CODEC_ID_MPEG4;
- break;
- case FFMPEG_FLV:
- fmt->video_codec = CODEC_ID_FLV1;
-diff -urN blender-2.49b.orig//source/blender/imbuf/intern/anim.c blender-2.49b/source/blender/imbuf/intern/anim.c
---- blender-2.49b.orig//source/blender/imbuf/intern/anim.c 2009-09-01 17:21:50.000000000 +0200
-+++ blender-2.49b/source/blender/imbuf/intern/anim.c 2011-11-13 06:21:37.000000000 +0100
-@@ -550,7 +550,7 @@
- videoStream=-1;
- for(i=0; inb_streams; i++)
- if(get_codec_from_stream(pFormatCtx->streams[i])->codec_type
-- == CODEC_TYPE_VIDEO) {
-+ == AVMEDIA_TYPE_VIDEO) {
- videoStream=i;
- break;
- }
-@@ -683,10 +683,10 @@
- && position - (anim->curposition + 1) < anim->preseek) {
- while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- if (packet.stream_index == anim->videoStream) {
-- avcodec_decode_video(
-+ avcodec_decode_video2(
- anim->pCodecCtx,
- anim->pFrame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
-
- if (frameFinished) {
- anim->curposition++;
-@@ -741,9 +741,9 @@
-
- while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- if(packet.stream_index == anim->videoStream) {
-- avcodec_decode_video(anim->pCodecCtx,
-+ avcodec_decode_video2(anim->pCodecCtx,
- anim->pFrame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
-
- if (frameFinished && !pos_found) {
- if (packet.dts >= pts_to_search) {
-diff -urN blender-2.49b.orig//source/blender/imbuf/intern/util.c blender-2.49b/source/blender/imbuf/intern/util.c
---- blender-2.49b.orig//source/blender/imbuf/intern/util.c 2009-09-01 17:21:50.000000000 +0200
-+++ blender-2.49b/source/blender/imbuf/intern/util.c 2011-11-13 04:37:27.000000000 +0100
-@@ -324,7 +324,7 @@
- return 0;
- }
-
-- if(UTIL_DEBUG) dump_format(pFormatCtx, 0, filename, 0);
-+ if(UTIL_DEBUG) av_dump_format(pFormatCtx, 0, filename, 0);
-
-
- /* Find the first video stream */
-@@ -332,7 +332,7 @@
- for(i=0; inb_streams; i++)
- if(pFormatCtx->streams[i] &&
- get_codec_from_stream(pFormatCtx->streams[i]) &&
-- (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+ (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- {
- videoStream=i;
- break;
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/BGL.o and blender-2.49b/source/blender/python/api2_2x/BGL.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/bpy_internal_import.o and blender-2.49b/source/blender/python/api2_2x/bpy_internal_import.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/constant.o and blender-2.49b/source/blender/python/api2_2x/constant.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/euler.o and blender-2.49b/source/blender/python/api2_2x/euler.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/Geometry.o and blender-2.49b/source/blender/python/api2_2x/Geometry.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/Mathutils.o and blender-2.49b/source/blender/python/api2_2x/Mathutils.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/matrix.o and blender-2.49b/source/blender/python/api2_2x/matrix.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/quat.o and blender-2.49b/source/blender/python/api2_2x/quat.o differ
-Binary files blender-2.49b.orig//source/blender/python/api2_2x/vector.o and blender-2.49b/source/blender/python/api2_2x/vector.o differ
-diff -urN blender-2.49b.orig//source/blender/src/buttons_scene.c blender-2.49b/source/blender/src/buttons_scene.c
---- blender-2.49b.orig//source/blender/src/buttons_scene.c 2009-09-01 17:21:46.000000000 +0200
-+++ blender-2.49b/source/blender/src/buttons_scene.c 2011-11-13 05:38:04.000000000 +0100
-@@ -2169,7 +2169,7 @@
- "Quicktime", FFMPEG_MOV,
- "DV", FFMPEG_DV,
- "H264", FFMPEG_H264,
-- "XVid", FFMPEG_XVID,
-+ "XVID", FFMPEG_XVID,
- #if 0
- /* ifdef WITH_OGG, disabled, since broken within ffmpeg bundled with blender */
- "OGG", FFMPEG_OGG,
-@@ -2212,7 +2212,7 @@
- "HuffYUV", CODEC_ID_HUFFYUV,
- "DV", CODEC_ID_DVVIDEO,
- "H264", CODEC_ID_H264,
-- "XVid", CODEC_ID_XVID,
-+ "XVid", CODEC_ID_MPEG4,
- #ifdef WITH_OGG
- "Theora", CODEC_ID_THEORA,
- #endif
-@@ -2723,12 +2723,12 @@
- switch (o->type) {
- case FF_OPT_TYPE_INT:
- case FF_OPT_TYPE_INT64:
-- val.i = o->default_val;
-+ val.i = o->default_val.dbl;
- idp_type = IDP_INT;
- break;
- case FF_OPT_TYPE_DOUBLE:
- case FF_OPT_TYPE_FLOAT:
-- val.f = o->default_val;
-+ val.f = o->default_val.dbl;
- idp_type = IDP_FLOAT;
- break;
- case FF_OPT_TYPE_STRING:
-diff -urN blender-2.49b.orig//source/blender/src/hddaudio.c blender-2.49b/source/blender/src/hddaudio.c
---- blender-2.49b.orig//source/blender/src/hddaudio.c 2009-09-01 17:21:45.000000000 +0200
-+++ blender-2.49b/source/blender/src/hddaudio.c 2011-11-13 06:27:23.000000000 +0100
-@@ -126,7 +126,7 @@
- audioStream=-1;
- for(i=0; inb_streams; i++)
- if(get_codec_from_stream(pFormatCtx->streams[i])
-- ->codec_type == CODEC_TYPE_AUDIO)
-+ ->codec_type == AVMEDIA_TYPE_AUDIO)
- {
- audioStream=i;
- break;
-@@ -382,39 +382,30 @@
- continue;
- }
-
-- audio_pkt_data = packet.data;
-- audio_pkt_size = packet.size;
--
-- while (audio_pkt_size > 0) {
-- data_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- len = avcodec_decode_audio2(
-- hdaudio->pCodecCtx,
-- hdaudio->decode_cache
-- + decode_pos
-- * hdaudio->decode_sample_format_size,
-- &data_size,
-- audio_pkt_data,
-- audio_pkt_size);
-- if (len <= 0) {
-- audio_pkt_size = 0;
-- break;
-- }
--
-- audio_pkt_size -= len;
-- audio_pkt_data += len;
--
-- if (data_size <= 0) {
-- continue;
-- }
--
-- decode_pos += data_size
-- / hdaudio->decode_sample_format_size;
-- if (decode_pos + data_size
-- / hdaudio->decode_sample_format_size
-- > hdaudio->decode_cache_size) {
-- break;
-- }
-- }
-+ data_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ len = avcodec_decode_audio3(
-+ hdaudio->pCodecCtx,
-+ hdaudio->decode_cache
-+ + decode_pos
-+ * hdaudio->decode_sample_format_size,
-+ &data_size,
-+ &packet);
-+ if (len <= 0) {
-+ audio_pkt_size = 0;
-+ break;
-+ }
-+
-+ if (data_size <= 0) {
-+ continue;
-+ }
-+
-+ decode_pos += data_size
-+ / hdaudio->decode_sample_format_size;
-+ if (decode_pos + data_size
-+ / hdaudio->decode_sample_format_size
-+ > hdaudio->decode_cache_size) {
-+ break;
-+ }
- av_free_packet(&packet);
-
- if (decode_pos + data_size / hdaudio->decode_sample_format_size
-@@ -534,36 +525,29 @@
- decode_cache_zero_init = 1;
- }
-
-- while (audio_pkt_size > 0) {
-- data_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- len = avcodec_decode_audio2(
-- hdaudio->pCodecCtx,
-- hdaudio->decode_cache
-- + decode_pos
-- * hdaudio->decode_sample_format_size,
-- &data_size,
-- audio_pkt_data,
-- audio_pkt_size);
-- if (len <= 0) {
-- audio_pkt_size = 0;
-- break;
-- }
--
-- audio_pkt_size -= len;
-- audio_pkt_data += len;
--
-- if (data_size <= 0) {
-- continue;
-- }
--
-- decode_pos += data_size
-- / hdaudio->decode_sample_format_size;
-- if (decode_pos + data_size
-- / hdaudio->decode_sample_format_size
-- > hdaudio->decode_cache_size) {
-- break;
-- }
-- }
-+ data_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ len = avcodec_decode_audio3(
-+ hdaudio->pCodecCtx,
-+ hdaudio->decode_cache
-+ + decode_pos
-+ * hdaudio->decode_sample_format_size,
-+ &data_size,
-+ &packet);
-+ if (len <= 0) {
-+ break;
-+ }
-+
-+ if (data_size <= 0) {
-+ continue;
-+ }
-+
-+ decode_pos += data_size
-+ / hdaudio->decode_sample_format_size;
-+ if (decode_pos + data_size
-+ / hdaudio->decode_sample_format_size
-+ > hdaudio->decode_cache_size) {
-+ break;
-+ }
-
- av_free_packet(&packet);
-
-diff -urN blender-2.49b.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.49b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.49b.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp 2009-09-01 17:20:53.000000000 +0200
-+++ blender-2.49b/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-11-13 07:56:56.000000000 +0100
-@@ -26,7 +26,6 @@
- #define __STDC_CONSTANT_MACROS
- #include
-
--
- #include "MEM_guardedalloc.h"
- #include "PIL_time.h"
-
-@@ -177,7 +176,7 @@
- {
- if(formatCtx->streams[i] &&
- get_codec_from_stream(formatCtx->streams[i]) &&
-- (get_codec_from_stream(formatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+ (get_codec_from_stream(formatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- {
- videoStream=i;
- break;
-@@ -358,9 +357,9 @@
- BLI_remlink(&video->m_packetCacheBase, cachePacket);
- // use m_frame because when caching, it is not used in main thread
- // we can't use currentFrame directly because we need to convert to RGB first
-- avcodec_decode_video(video->m_codecCtx,
-+ avcodec_decode_video2(video->m_codecCtx,
- video->m_frame, &frameFinished,
-- cachePacket->packet.data, cachePacket->packet.size);
-+ &cachePacket->packet);
- if(frameFinished)
- {
- AVFrame * input = video->m_frame;
-@@ -628,7 +627,7 @@
- if (m_captRate <= 0.f)
- m_captRate = defFrameRate;
- sprintf(rateStr, "%f", m_captRate);
-- av_parse_video_frame_rate(&frameRate, rateStr);
-+ av_parse_video_rate(&frameRate, rateStr);
- // populate format parameters
- // need to specify the time base = inverse of rate
- formatParams.time_base.num = frameRate.den;
-@@ -887,10 +886,10 @@
- {
- if (packet.stream_index == m_videoStream)
- {
-- avcodec_decode_video(
-+ avcodec_decode_video2(
- m_codecCtx,
- m_frame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
- if (frameFinished)
- m_curPosition++;
- }
-@@ -966,9 +965,9 @@
- {
- if(packet.stream_index == m_videoStream)
- {
-- avcodec_decode_video(m_codecCtx,
-+ avcodec_decode_video2(m_codecCtx,
- m_frame, &frameFinished,
-- packet.data, packet.size);
-+ &packet);
-
- if (frameFinished && !posFound)
- {
-diff -urN blender-2.49b.orig//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.49b/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.49b.orig//source/gameengine/VideoTexture/VideoFFmpeg.h 2009-09-01 17:20:53.000000000 +0200
-+++ blender-2.49b/source/gameengine/VideoTexture/VideoFFmpeg.h 2011-11-13 08:03:51.000000000 +0100
-@@ -28,6 +28,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include "DNA_listBase.h"
- #include "BLI_threads.h"
diff --git a/media-gfx/blender/files/blender-2.49b-linux-3.patch b/media-gfx/blender/files/blender-2.49b-linux-3.patch
deleted file mode 100644
index 6a96b49d12ca..000000000000
--- a/media-gfx/blender/files/blender-2.49b-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct 2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct 2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
-
-+if platform == 'linux3':
-+ platform = 'linux2' # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
-
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.49b-subversion-1.7.patch b/media-gfx/blender/files/blender-2.49b-subversion-1.7.patch
deleted file mode 100644
index 34b4b8aa3ed3..000000000000
--- a/media-gfx/blender/files/blender-2.49b-subversion-1.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/Blender.py 2011-10-29 06:32:11.706449854 +0200
-+++ tools/Blender.py 2011-10-29 06:32:15.923397138 +0200
-@@ -219,7 +219,10 @@
- """
- build_date = time.strftime ("%Y-%m-%d")
- build_time = time.strftime ("%H:%M:%S")
-- build_rev = os.popen('svnversion').read()[:-1] # remove \n
-+ # svn 1.6 says "exported"
-+ # svn 1.7 says "Unversioned directory"
-+ # Latter breaks the build somewhere, former doesn't.
-+ build_rev = 'exported'
-
- obj = []
- if lenv['BF_BUILDINFO']:
diff --git a/media-gfx/blender/files/blender.desktop b/media-gfx/blender/files/blender.desktop
deleted file mode 100644
index 14cef349f31e..000000000000
--- a/media-gfx/blender/files/blender.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender 2.4x
-Comment=3D modeling, animation, rendering and post-production.
-Exec=blender
-Icon=blender
-Terminal=0
-Type=Application
-Categories=Graphics;Application;
diff --git a/media-gfx/fbida/fbida-2.09.ebuild b/media-gfx/fbida/fbida-2.09.ebuild
index 327404e7e5f8..2ed974b4b4b1 100644
--- a/media-gfx/fbida/fbida-2.09.ebuild
+++ b/media-gfx/fbida/fbida-2.09.ebuild
@@ -1,50 +1,58 @@
-# 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-gfx/fbida/fbida-2.09.ebuild,v 1.1 2012/12/02 16:29:49 jer Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09.ebuild,v 1.2 2013/02/05 22:40:34 jer Exp $
+EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
-HOMEPAGE="http://linux.bytesex.org/fbida/"
-SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="http://www.kraxel.org/releases/${PN}/${P}.tar.gz
mirror://gentoo/ida.png.bz2" #370901
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X"
-RDEPEND="png? ( media-libs/libpng )
+RDEPEND="
+ curl? ( net-misc/curl )
gif? ( media-libs/giflib )
+ lirc? ( app-misc/lirc )
pdf? ( app-text/ghostscript-gpl media-libs/tiff )
+ png? ( media-libs/libpng )
tiff? ( media-libs/tiff )
- curl? ( net-misc/curl )
- lirc? ( app-misc/lirc )
- imagemagick? ( || ( media-gfx/imagemagick
- media-gfx/graphicsmagick[imagemagick] ) )
+ imagemagick? (
+ || (
+ media-gfx/imagemagick
+ media-gfx/graphicsmagick[imagemagick]
+ )
+ )
scanner? ( media-gfx/sane-backends )
- X? ( x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXpm
+ X? (
>=x11-libs/motif-2.3:0
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXt
)
!media-gfx/fbi
- virtual/jpeg
- media-libs/libexif
- >=media-libs/freetype-2.0
>=media-libs/fontconfig-2.2
- virtual/ttf-fonts"
+ >=media-libs/freetype-2.0
+ media-libs/libexif
+ virtual/jpeg
+ virtual/ttf-fonts
+"
-DEPEND="${RDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )"
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-proto/xextproto x11-proto/xproto )
+"
src_prepare() {
- sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
- -e 's/-lungif/-lgif/' -i "${S}/GNUmakefile"
+ sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \
+ -e 's:-lungif:-lgif:' -i "${S}/GNUmakefile"
- if [[ `gcc-major-version` -lt 4 ]]; then
- sed -e 's/-Wno-pointer-sign//' -i "${S}/GNUmakefile"
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ sed -e 's:-Wno-pointer-sign::' -i "${S}/GNUmakefile" || die
fi
epatch "${FILESDIR}"/ida-desktop.patch
@@ -54,7 +62,7 @@ src_prepare() {
src_configure() {
# Let autoconf do its job and then fix things to build fbida
# according to our specifications
- emake Make.config || die
+ emake Make.config
set_feat() {
local useflag=${1}
@@ -65,7 +73,9 @@ src_configure() {
option="no"
fi
- sed -e "s/${config}.*/${config} := ${option}/" -i "${S}/Make.config"
+ sed -i \
+ -e "s|${config}.*|${config} := ${option}|" \
+ "${S}/Make.config" || die
}
set_feat fbcon HAVE_LINUX_FB_H
@@ -82,12 +92,17 @@ src_configure() {
set_feat imagemagick HAVE_LIBMAGICK
}
+src_compile() {
+ emake verbose=yes
+}
+
src_install() {
- make \
+ emake \
DESTDIR="${D}" \
STRIP="" \
prefix=/usr \
- install || die
+ install
+
dodoc README
if ! use pdf; then
diff --git a/media-libs/gupnp-dlna/metadata.xml b/media-libs/gupnp-dlna/metadata.xml
index e3ee5027a199..35aa2813314f 100644
--- a/media-libs/gupnp-dlna/metadata.xml
+++ b/media-libs/gupnp-dlna/metadata.xml
@@ -3,10 +3,6 @@
net-p2p
gnome
-
- ford_prefect@gentoo.org
- Arun Raghavan
-
-
- dagger@gentoo.org
- Robert Piasek
-
radhermit@gentoo.org
Tim Harder
@@ -1630,10 +1623,6 @@
maekke@gentoo.org
Markus Meier
-
- dagger@gentoo.org
- Robert Piasek
-
xmw@gentoo.org
Michael Weber
@@ -2315,6 +2304,10 @@
creffett@gentoo.org
Chris Reffett
+
+ xmw@gentoo.org
+ Michael Weber
+
suse
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6 b/metadata/md5-cache/app-admin/clustershell-1.6
new file mode 100644
index 000000000000..c55d381317a5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/clustershell-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[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(-)] python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) 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(-)]
+DESCRIPTION=Python framework for efficient cluster administration
+EAPI=5
+HOMEPAGE=http://cea-hpc.github.com/clustershell/
+IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-C
+RDEPEND=dev-libs/openssl python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) 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(-)]
+SLOT=0
+SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=70a6faa9e3316d8e8475af283d2e2046
diff --git a/metadata/md5-cache/app-benchmarks/gtkperf-0.40 b/metadata/md5-cache/app-benchmarks/gtkperf-0.40-r1
similarity index 53%
rename from metadata/md5-cache/app-benchmarks/gtkperf-0.40
rename to metadata/md5-cache/app-benchmarks/gtkperf-0.40-r1
index 52f2c8c9805b..bf530a734f8a 100644
--- a/metadata/md5-cache/app-benchmarks/gtkperf-0.40
+++ b/metadata/md5-cache/app-benchmarks/gtkperf-0.40-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=configure install prepare
DEPEND=x11-libs/gtk+:2 nls? ( sys-devel/gettext ) virtual/pkgconfig
DESCRIPTION=Application designed to test GTK+ performance
-EAPI=1
+EAPI=5
HOMEPAGE=http://gtkperf.sourceforge.net/
IUSE=nls
KEYWORDS=~amd64 ~ppc ~x86
@@ -9,4 +9,5 @@ LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://sourceforge/gtkperf/gtkperf_0.40.tar.gz
-_md5_=6f9a969a81cff736da6df7a69d08aca0
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aa42e8044ccd404059073358adce5a74
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.23 b/metadata/md5-cache/app-emulation/wine-1.5.23
deleted file mode 100644
index 5cb76b43f4a2..000000000000
--- a/metadata/md5-cache/app-emulation/wine-1.5.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare 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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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
-DESCRIPTION=Free implementation of Windows(tm) on Unix
-EAPI=5
-HOMEPAGE=http://www.winehq.org/
-IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml pulseaudio
-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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit )
-REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.23.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( 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.23.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9960ea3676688f8d90d1f089a7eebe53
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.23-r1 b/metadata/md5-cache/app-emulation/wine-1.5.23-r1
index 1fae9637456e..4a68db2096c7 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.23-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.23-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare 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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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
+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:= net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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
DESCRIPTION=Free implementation of Windows(tm) on Unix
EAPI=5
HOMEPAGE=http://www.winehq.org/
-IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml pulseaudio
+IUSE=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 +win32 +win64 +X xcomposite xinerama xml pulseaudio
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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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:= net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( media-sound/pulseaudio sys-auth/rtkit )
REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.23.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( 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.23.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=56d24bed5aa41919b6401bcc42341792
+_md5_=693680dba63a2e5a2dd5d337f2175918
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index b3dca2ae429e..c0b7f11a9de6 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 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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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 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:= net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) 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 dev-vcs/git
DESCRIPTION=Free implementation of Windows(tm) on Unix
EAPI=5
HOMEPAGE=http://www.winehq.org/
-IUSE=alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml
+IUSE=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 +win32 +win64 +X xcomposite xinerama xml
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 ) gnutls? ( net-libs/gnutls:= ) 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:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
+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:= net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) osmesa? ( opengl )
RESTRICT=test
SLOT=0
SRC_URI=gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.9/wine_gecko-1.9-x86.msi win64? ( 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.23.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2012.11.24.tar.bz2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=83efd2b7987ad17f496ef47fc70cc79f
+_md5_=d9e910933770cc8808edd018c5876414
diff --git a/metadata/md5-cache/app-portage/ufed-9999 b/metadata/md5-cache/app-portage/ufed-9999
index 5aa953f868d6..5dd79f4d256d 100644
--- a/metadata/md5-cache/app-portage/ufed-9999
+++ b/metadata/md5-cache/app-portage/ufed-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses dev-lang/perl
SLOT=0
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3fbd01b5584d34cee1277708eb296a15
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=91f52d5a3659b4198679f4ba98efb333
diff --git a/metadata/md5-cache/app-text/libmspub-0.0.3 b/metadata/md5-cache/app-text/libmspub-0.0.4
similarity index 58%
rename from metadata/md5-cache/app-text/libmspub-0.0.3
rename to metadata/md5-cache/app-text/libmspub-0.0.4
index fbf7fafd2228..d01fb7481f4c 100644
--- a/metadata/md5-cache/app-text/libmspub-0.0.3
+++ b/metadata/md5-cache/app-text/libmspub-0.0.4
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib virtual/pkgconfig dev-libs/boost sys-devel/libtool doc? ( app-doc/doxygen )
DESCRIPTION=Library parsing the Microsoft Publisher documents
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/libmspub
IUSE=doc static-libs
KEYWORDS=~amd64 ~arm ~ppc ~x86
LICENSE=LGPL-2.1
-RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib
+RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib
SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libmspub-0.0.3.tar.xz
+SRC_URI=http://dev-www.libreoffice.org/src/libmspub-0.0.4.tar.xz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8867f36d3bc7d717bef5376acbc1d76a
+_md5_=80022d769e88b0d8dddd822bc8fb7241
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index 970826442d5e..d212d1d6036d 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib virtual/pkgconfig dev-libs/boost sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
DESCRIPTION=Library parsing the Microsoft Publisher documents
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.freedesktop.org/wiki/Software/libmspub
IUSE=doc static-libs
LICENSE=LGPL-2.1
-RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib
+RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib
SLOT=0
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4cb85538b4c593c59b8c6287ea876cae
+_md5_=454f1ff7a82ab5d7f0eb9f7022857134
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.4.1 b/metadata/md5-cache/app-text/yelp-tools-3.4.1
index 42bb96cb26ad..03b48e90ca7f 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.4.1
+++ b/metadata/md5-cache/app-text/yelp-tools-3.4.1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool gnom
SLOT=0
SRC_URI=mirror://gnome/sources/yelp-tools/3.4/yelp-tools-3.4.1.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 96ca31031ada9967bcf96a4fd8977ae4 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=5867af93d3406e8b6906cf2527ecf801
+_md5_=8ea030978f2a0a3d43a8e0585beb2e4c
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.6.1 b/metadata/md5-cache/app-text/yelp-tools-3.6.1
index 1d0ae5548272..6b6734b80f85 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.6.1
+++ b/metadata/md5-cache/app-text/yelp-tools-3.6.1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool gnom
SLOT=0
SRC_URI=mirror://gnome/sources/yelp-tools/3.6/yelp-tools-3.6.1.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 96ca31031ada9967bcf96a4fd8977ae4 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=d23ea5cf7de1048e1cfd14d613987fca
+_md5_=1e2babfe62742f68590bbef02b32b883
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.6.1-r1 b/metadata/md5-cache/app-text/yelp-tools-3.6.1-r1
new file mode 100644
index 000000000000..f6059997a3d9
--- /dev/null
+++ b/metadata/md5-cache/app-text/yelp-tools-3.6.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool gnome-extra/yelp-xsl sys-apps/gawk virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Collection of tools for building and converting documentation
+EAPI=5
+HOMEPAGE=http://www.gnome.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2+ freedist ) GPL-2+
+RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool gnome-extra/yelp-xsl sys-apps/gawk
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-tools/3.6/yelp-tools-3.6.1.tar.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 96ca31031ada9967bcf96a4fd8977ae4 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=7a40e11fec33fde4ed0cc0ce88f5d0b7
diff --git a/metadata/md5-cache/dev-db/postgis-2.0.2-r1 b/metadata/md5-cache/dev-db/postgis-2.0.2-r1
index 8d0aceb7b09a..a28167714937 100644
--- a/metadata/md5-cache/dev-db/postgis-2.0.2-r1
+++ b/metadata/md5-cache/dev-db/postgis-2.0.2-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.0.2.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7e7bed8ba763b5f3e870d72e87a28426
+_md5_=2da436562334951600a6e0811e882a18
diff --git a/metadata/md5-cache/dev-dotnet/google-gdata-sharp-1.4.0.2 b/metadata/md5-cache/dev-dotnet/google-gdata-sharp-1.4.0.2
deleted file mode 100644
index 08193528bc4c..000000000000
--- a/metadata/md5-cache/dev-dotnet/google-gdata-sharp-1.4.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-lang/mono-2.0
-DESCRIPTION=C# bindings for the Google GData API
-EAPI=3
-HOMEPAGE=http://code.google.com/p/google-gdata/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/mono-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=http://google-gdata.googlecode.com/files/libgoogle-data-mono-1.4.0.2.tar.gz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 mono 203a4295c06155d318bdff9c6b2d5e1c multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f1c9c28d935f3132244ff433f2e56e8
diff --git a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1 b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
index 2161b2257b94..b76028a3f0f9 100644
--- a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
+++ b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-embedded/include sys-apps/gawk sys-apps/grep sys-apps/sed sys-devel/gcc sys-devel/gettext
+DEFINED_PHASES=prepare
+DEPEND=dev-embedded/include
DESCRIPTION=software package for working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter
+EAPI=4
HOMEPAGE=http://openwince.sourceforge.net/jtag/
KEYWORDS=x86 sparc ~ppc
LICENSE=GPL-2
-RDEPEND=!dev-embedded/urjtag dev-embedded/include
+RDEPEND=dev-embedded/include !dev-embedded/urjtag
SLOT=0
SRC_URI=mirror://sourceforge/openwince/jtag-0.5.1.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46ba11cdb6d63acd6c2ebdd3c1cc5541
+_md5_=4fc05cf9d4066c4b3cddae00a9b05700
diff --git a/metadata/md5-cache/dev-embedded/uisp-20050207-r1 b/metadata/md5-cache/dev-embedded/uisp-20050207-r1
index 8c73b41e4f87..29ed8604a69a 100644
--- a/metadata/md5-cache/dev-embedded/uisp-20050207-r1
+++ b/metadata/md5-cache/dev-embedded/uisp-20050207-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/gawk sys-devel/gcc
+DEFINED_PHASES=install prepare
DESCRIPTION=tool for AVR microcontrollers which can interface to many hardware in-system programmers
+EAPI=4
HOMEPAGE=http://savannah.nongnu.org/projects/uisp
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://savannah.nongnu.org/download/uisp/uisp-20050207.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8dc56f49e0d7081849aa37e28f65bd2
+_md5_=65e1d3d1d0d83ae2b90968f777f7012f
diff --git a/metadata/md5-cache/dev-lang/v8-3.15.11.11 b/metadata/md5-cache/dev-lang/v8-3.15.11.15
similarity index 90%
rename from metadata/md5-cache/dev-lang/v8-3.15.11.11
rename to metadata/md5-cache/dev-lang/v8-3.15.11.15
index 179267788456..27a7063c300e 100644
--- a/metadata/md5-cache/dev-lang/v8-3.15.11.11
+++ b/metadata/md5-cache/dev-lang/v8-3.15.11.15
@@ -6,6 +6,6 @@ HOMEPAGE=http://code.google.com/p/v8
KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos
LICENSE=BSD
SLOT=0/3.15.11
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.15.11.11.tar.bz2
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.15.11.15.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf python-any-r1 9bedbe95123c76570994470ea4e0cc5b python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=748a2e8dc2d7d22efcbea116ae200674
+_md5_=aa54dfd4ecff3102953d5f8927af51f6
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8y b/metadata/md5-cache/dev-libs/openssl-0.9.8y
new file mode 100644
index 000000000000..6839e1be44c4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8y
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0 sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc )
+DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
+EAPI=2
+HOMEPAGE=http://www.openssl.org/
+IUSE=bindist gmp kerberos sse2 test zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=openssl
+RDEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0
+SLOT=0.9.8
+SRC_URI=mirror://openssl/source/openssl-0.9.8y.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=88dd8c9cd789815e967e20bd10e27dfc
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1d b/metadata/md5-cache/dev-libs/openssl-1.0.1d
new file mode 100644
index 000000000000..9b9866114d54
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1d
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) !=dev-lang/perl-5 test? ( sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)
+EAPI=4
+HOMEPAGE=http://www.openssl.org/
+IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) ! openssl-c_rehash.sh.1.7
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2c69581b8169cbc6228966e670affe38
diff --git a/metadata/md5-cache/dev-python/aplpy-0.9.7 b/metadata/md5-cache/dev-python/aplpy-0.9.7
deleted file mode 100644
index c342ef37b3a0..000000000000
--- a/metadata/md5-cache/dev-python/aplpy-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/numpy =dev-lang/python-2*
-DESCRIPTION=Astronomical Plotting Library in Python
-EAPI=2
-HOMEPAGE=http://aplpy.github.com/ http://pypi.python.org/pypi/APLpy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/numpy dev-python/matplotlib dev-python/pyfits dev-python/pywcs =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://github/aplpy/aplpy/APLpy-0.9.7.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=cd7f02fcad8b90fcdc2f908611177071
diff --git a/metadata/md5-cache/dev-python/aplpy-0.9.8-r1 b/metadata/md5-cache/dev-python/aplpy-0.9.8-r1
new file mode 100644
index 000000000000..b6a06c0ac273
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aplpy-0.9.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy test? ( dev-python/pytest[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/numpy dev-python/matplotlib dev-python/pyfits dev-python/pywcs ) python_targets_python2_5? ( dev-lang/python:2.5 ) 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_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Astronomical Plotting Library in Python
+EAPI=5
+HOMEPAGE=http://aplpy.github.com/
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-python/numpy dev-python/matplotlib dev-python/pyfits dev-python/pywcs python_targets_python2_5? ( dev-lang/python:2.5 ) 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_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://github/aplpy/aplpy/APLpy-0.9.8.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dc0aea2bd618b819111d5d73b283603a
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1 b/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1
new file mode 100644
index 000000000000..db534fc53052
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/sqlite-3.7.15.2[extensions] app-arch/unzip python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=APSW - Another Python SQLite Wrapper
+EAPI=5
+HOMEPAGE=http://code.google.com/p/apsw/
+IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=dev-db/sqlite-3.7.15.2[extensions] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0
+SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.15.2-r1.zip
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e04fcf049638b1983944e5812c2b9233
diff --git a/metadata/md5-cache/dev-python/docutils-0.9.1-r1 b/metadata/md5-cache/dev-python/docutils-0.9.1-r1
index f340b996b123..d07fc4205f0d 100644
--- a/metadata/md5-cache/dev-python/docutils-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.9.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python Documentation Utilities
EAPI=5
HOMEPAGE=http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils
IUSE=glep python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-2 GPL-3 public-domain
RDEPEND=dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-)]
SLOT=0
SRC_URI=mirror://sourceforge/docutils/docutils-0.9.1.tar.gz glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )
_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d31f466e4b5cc90776965a2f110da258
+_md5_=ee868b3ed3291f9b805a95a8d9bb31e9
diff --git a/metadata/md5-cache/dev-python/gevent-1.0_beta2-r1 b/metadata/md5-cache/dev-python/gevent-1.0_beta2-r1
new file mode 100644
index 000000000000..041c727b791a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gevent-1.0_beta2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libev net-dns/c-ares dev-python/greenlet[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[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[ssl] ) python_targets_python2_7? ( dev-lang/python:2.7[ssl] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Python networking library that uses greenlet to provide synchronous API
+EAPI=5
+HOMEPAGE=http://code.google.com/p/gevent/ http://pypi.python.org/pypi/gevent/
+IUSE=doc examples python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libev net-dns/c-ares dev-python/greenlet[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[ssl] ) python_targets_python2_7? ( dev-lang/python:2.7[ssl] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://gevent.googlecode.com/files/gevent-1.0b2.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3929fec0d65de202ae8bb560ca0468d4
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.0-r2 b/metadata/md5-cache/dev-python/pycurl-7.19.0-r2
new file mode 100644
index 000000000000..d2725e8ed9e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_5? ( dev-lang/python:2.5 ) 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_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=python binding for curl/libcurl
+EAPI=5
+HOMEPAGE=http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl
+IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_5? ( dev-lang/python:2.5 ) 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_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0e5773507f89b40794c6829869e74b4c
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.0-r3 b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
new file mode 100644
index 000000000000..faef089079a9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=python binding for curl/libcurl
+EAPI=5
+HOMEPAGE=http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl
+IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0
+SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=83450a337b7a04fca90bb9a2d85eeff1
diff --git a/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1 b/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
new file mode 100644
index 000000000000..4d4f09901222
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/zeromq-2.1.9 test? ( dev-python/nose[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gevent[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library
+EAPI=5
+HOMEPAGE=http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq
+IUSE=examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=>=net-libs/zeromq-2.1.9 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0
+SRC_URI=mirror://pypi/p/pyzmq/pyzmq-2.2.0.1.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b99aad3be252f446a21e1b984119beb5
diff --git a/metadata/md5-cache/dev-python/sphinx-1.0.7 b/metadata/md5-cache/dev-python/sphinx-1.0.7
deleted file mode 100644
index bd8e9e4835f0..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/docutils-0.5 >=dev-python/jinja-2.2 >=dev-python/pygments-0.8 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=Python documentation generator
-EAPI=3
-HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.5 >=dev-python/jinja-2.2 >=dev-python/pygments-0.8 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.0.7.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=3240ac7bd0b3c54c94a4bdc76e7cddc4
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.2 b/metadata/md5-cache/dev-python/sphinx-1.1.2
deleted file mode 100644
index 53c959cf6039..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=Python documentation generator
-EAPI=3
-HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.2.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=c84290fc67f5521b33d3c158ecdae70e
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3 b/metadata/md5-cache/dev-python/sphinx-1.1.3
deleted file mode 100644
index 8a416b5583e1..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=Python documentation generator
-EAPI=3
-HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=8be462f65cbc937a2f79a4be41792472
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r1 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r1
deleted file mode 100644
index 1e2eaa9ddad6..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=Python documentation generator
-EAPI=3
-HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=f4d3b437b17e9905a9297f5fb7223624
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r2 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r2
deleted file mode 100644
index f9449a717f5b..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=Python documentation generator
-EAPI=4
-HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
-IUSE=doc latex test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=6d86c18ff329148419c38b7089bea799
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r6 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
new file mode 100644
index 000000000000..a081f4b71f1a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=test? ( dev-python/nose[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Python documentation generator
+EAPI=5
+HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
+IUSE=doc latex test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/docutils-0.7[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/pygments-1.2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=fe820e7c5452585579064b486f940d3f
diff --git a/metadata/md5-cache/dev-scheme/chicken-4.8.0 b/metadata/md5-cache/dev-scheme/chicken-4.8.0.1
similarity index 66%
rename from metadata/md5-cache/dev-scheme/chicken-4.8.0
rename to metadata/md5-cache/dev-scheme/chicken-4.8.0.1
index 66587f9e72a2..4c73679b7c56 100644
--- a/metadata/md5-cache/dev-scheme/chicken-4.8.0
+++ b/metadata/md5-cache/dev-scheme/chicken-4.8.0.1
@@ -3,12 +3,12 @@ DEPEND=sys-apps/texinfo emacs? ( virtual/emacs )
DESCRIPTION=Chicken is a Scheme interpreter and native Scheme to C compiler
EAPI=3
HOMEPAGE=http://www.call-cc.org/
-IUSE=emacs parallel-build
+IUSE=emacs parallel-build doc
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
LICENSE=BSD
RDEPEND=emacs? ( virtual/emacs app-emacs/scheme-complete )
RESTRICT=test
SLOT=0
-SRC_URI=http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0afa0bc7256026ce24ea44cb861beb0f
+SRC_URI=http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.1.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=980b62815500f302d75d50bc331cc953
diff --git a/metadata/md5-cache/games-emulation/stella-3.7.5 b/metadata/md5-cache/games-emulation/stella-3.7.5
index b8aabeb933f7..c8bfa4ebce3f 100644
--- a/metadata/md5-cache/games-emulation/stella-3.7.5
+++ b/metadata/md5-cache/games-emulation/stella-3.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=Stella Atari 2600 VCS Emulator
EAPI=2
HOMEPAGE=http://stella.sourceforge.net/
IUSE=joystick opengl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[joystick?,opengl?,video] x11-libs/libX11 media-libs/libpng:0 sys-libs/zlib opengl? ( virtual/opengl virtual/glu )
SLOT=0
SRC_URI=mirror://sourceforge/stella/stella-3.7.5-src.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 games e0a83e3f3f024b8c8ef7a8217d716cbf gnome2-utils 794d2847b4af390a1e020924876c8297 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3c44e59036aca75dc9fde571de0d5ba5
+_md5_=2c1f39db740bc92bc22e5d6d27206737
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.2.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.2.1
deleted file mode 100644
index c8c121c24c06..000000000000
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 sys-apps/gawk sys-devel/gettext >=dev-util/intltool-0.40 dev-util/itstool virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=XSL stylesheets for yelp
-EAPI=4
-HOMEPAGE=http://www.gnome.org/
-KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
-RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp-xsl/3.2/yelp-xsl-3.2.1.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 gnome.org 8fef8f967214f56e08fa92d61163d891 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=06ddcaf736c3be31fbf65878685d5020
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.4.2 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.4.2
index be1d3cc63b9e..38c1d3c46c50 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.4.2
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.4.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 >=dev-util/intltool-0.40 dev-util/itstool sys-apps/gawk sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
DESCRIPTION=XSL stylesheets for yelp
EAPI=4
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8
SLOT=0
SRC_URI=mirror://gnome/sources/yelp-xsl/3.4/yelp-xsl-3.4.2.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 gnome.org 8fef8f967214f56e08fa92d61163d891 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=1e61de666fbebf2a331e384c3452e72c
+_md5_=3453d5054858c2ef337ba4d0e08b4f3d
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.6.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.6.1
index 3d6edbb64f81..e8b8a2ba6b51 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.6.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.6.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 >=dev-util/intltool-0.40 dev-util/itstool sys-apps/gawk sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
DESCRIPTION=XSL stylesheets for yelp
EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8
SLOT=0
SRC_URI=mirror://gnome/sources/yelp-xsl/3.6/yelp-xsl-3.6.1.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 gnome.org 8fef8f967214f56e08fa92d61163d891 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=d58ae325517083fc07c8ee8e5139bbdc
+_md5_=1d01316153b8f8835725ed6ad8767cd3
diff --git a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8 b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
index dad57137cf8a..d263e545c8ea 100644
--- a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
+++ b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
@@ -4,9 +4,9 @@ DESCRIPTION=Hacked version of IPA fonts, which is suitable for browsing 2ch
HOMEPAGE=http://www.geocities.jp/ipa_mona/index.html
IUSE=X
KEYWORDS=alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd
-LICENSE=grass-ipafonts as-is
+LICENSE=grass-ipafonts mplus-fonts public-domain
RESTRICT=mirror
SLOT=0
SRC_URI=http://www.geocities.jp/ipa_mona/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 font 9aa70ebc5cefbdd9056687b550a2fdc4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f69f869cb7a8ead358f3052e753f0fdd
+_md5_=ce63370f8db4c4b3b1c569b05a552d7c
diff --git a/metadata/md5-cache/media-fonts/sazanami-20040629 b/metadata/md5-cache/media-fonts/sazanami-20040629
index 25726738417d..4dec5bb9db23 100644
--- a/metadata/md5-cache/media-fonts/sazanami-20040629
+++ b/metadata/md5-cache/media-fonts/sazanami-20040629
@@ -4,9 +4,9 @@ DESCRIPTION=Sazanami Japanese TrueType fonts
HOMEPAGE=http://efont.sourceforge.jp/
IUSE=X
KEYWORDS=alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=as-is public-domain
+LICENSE=mplus-fonts public-domain
RESTRICT=strip binchecks
SLOT=0
SRC_URI=mirror://sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 font 9aa70ebc5cefbdd9056687b550a2fdc4 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e8d51093ee924d62343251da35dd4498
+_md5_=aee7f5663dda6001e3961d6fd187015a
diff --git a/metadata/md5-cache/media-gfx/blender-2.49b-r2 b/metadata/md5-cache/media-gfx/blender-2.49b-r2
deleted file mode 100644
index 78436d1e6422..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.49b-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=dev-util/scons-2 sys-devel/gcc[openmp?] x11-base/xorg-server ffmpeg? ( virtual/ffmpeg[encode,theora] ) >=media-libs/openjpeg-1.5.0 media-libs/tiff:0 nls? ( >=media-libs/freetype-2.0 virtual/libintl >=media-libs/ftgl-2.1 ) openal? ( >=media-libs/openal-1.6.372 >=media-libs/freealut-1.1.0-r1 ) media-libs/openexr media-libs/libpng:0 blender-game? ( >=media-libs/libsdl-1.2[joystick] ) >=media-libs/libsdl-1.2 ogg? ( media-libs/libogg ) virtual/jpeg virtual/opengl dev-util/scons || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=2
-HOMEPAGE=http://www.blender.org/
-IUSE=blender-game ffmpeg nls ogg openmp verse openal
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 BL BSD )
-RDEPEND=ffmpeg? ( virtual/ffmpeg[encode,theora] ) >=media-libs/openjpeg-1.5.0 media-libs/tiff:0 nls? ( >=media-libs/freetype-2.0 virtual/libintl >=media-libs/ftgl-2.1 ) openal? ( >=media-libs/openal-1.6.372 >=media-libs/freealut-1.1.0-r1 ) media-libs/openexr media-libs/libpng:0 blender-game? ( >=media-libs/libsdl-1.2[joystick] ) >=media-libs/libsdl-1.2 ogg? ( media-libs/libogg ) virtual/jpeg virtual/opengl || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://download.blender.org/source/blender-2.49b.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f5eceab811ca8a2aafdac7737dcc4e82
diff --git a/metadata/md5-cache/media-gfx/fbida-2.09 b/metadata/md5-cache/media-gfx/fbida-2.09
index a60c8bc5b1ef..190be9093b18 100644
--- a/metadata/md5-cache/media-gfx/fbida-2.09
+++ b/metadata/md5-cache/media-gfx/fbida-2.09
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=png? ( media-libs/libpng ) gif? ( media-libs/giflib ) pdf? ( app-text/ghostscript-gpl media-libs/tiff ) tiff? ( media-libs/tiff ) curl? ( net-misc/curl ) lirc? ( app-misc/lirc ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) scanner? ( media-gfx/sane-backends ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm >=x11-libs/motif-2.3:0 ) !media-gfx/fbi virtual/jpeg media-libs/libexif >=media-libs/freetype-2.0 >=media-libs/fontconfig-2.2 virtual/ttf-fonts X? ( x11-proto/xextproto x11-proto/xproto )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=curl? ( net-misc/curl ) gif? ( media-libs/giflib ) lirc? ( app-misc/lirc ) pdf? ( app-text/ghostscript-gpl media-libs/tiff ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) scanner? ( media-gfx/sane-backends ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) !media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif virtual/jpeg virtual/ttf-fonts X? ( x11-proto/xextproto x11-proto/xproto )
DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida).
-EAPI=2
-HOMEPAGE=http://linux.bytesex.org/fbida/
+EAPI=5
+HOMEPAGE=http://www.kraxel.org/blog/linux/fbida/
IUSE=curl fbcon gif imagemagick lirc pdf png scanner tiff X
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=png? ( media-libs/libpng ) gif? ( media-libs/giflib ) pdf? ( app-text/ghostscript-gpl media-libs/tiff ) tiff? ( media-libs/tiff ) curl? ( net-misc/curl ) lirc? ( app-misc/lirc ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) scanner? ( media-gfx/sane-backends ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm >=x11-libs/motif-2.3:0 ) !media-gfx/fbi virtual/jpeg media-libs/libexif >=media-libs/freetype-2.0 >=media-libs/fontconfig-2.2 virtual/ttf-fonts
+RDEPEND=curl? ( net-misc/curl ) gif? ( media-libs/giflib ) lirc? ( app-misc/lirc ) pdf? ( app-text/ghostscript-gpl media-libs/tiff ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) scanner? ( media-gfx/sane-backends ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) !media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif virtual/jpeg virtual/ttf-fonts
SLOT=0
-SRC_URI=http://dl.bytesex.org/releases/fbida/fbida-2.09.tar.gz mirror://gentoo/ida.png.bz2
+SRC_URI=http://www.kraxel.org/releases/fbida/fbida-2.09.tar.gz mirror://gentoo/ida.png.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c67b6fe2b6b3610ab0b3b5b99715823
+_md5_=c31e133c0fc8d5863e4b6eea315773ff
diff --git a/metadata/md5-cache/media-libs/netpbm-10.56.00 b/metadata/md5-cache/media-libs/netpbm-10.56.00
deleted file mode 100644
index 8349012eff6e..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.56.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=3
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=jbig jpeg jpeg2k png rle svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/netpbm-10.56.00.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=565f87209f14ea15432eb02f7ed54e99
diff --git a/metadata/md5-cache/media-libs/netpbm-10.57.00 b/metadata/md5-cache/media-libs/netpbm-10.57.00
deleted file mode 100644
index 02ecae7e1256..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.57.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=3
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=jbig jpeg jpeg2k png rle svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/netpbm-10.57.00.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b240d4ed031f3485641bad3b8fe19fa1
diff --git a/metadata/md5-cache/media-libs/netpbm-10.58.00 b/metadata/md5-cache/media-libs/netpbm-10.58.00
deleted file mode 100644
index b064a91be15f..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.58.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=4
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg jpeg2k png rle svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/netpbm-10.58.00.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4b96059e4b56f3283b33e19aad11846e
diff --git a/metadata/md5-cache/media-libs/netpbm-10.59.00 b/metadata/md5-cache/media-libs/netpbm-10.59.00
deleted file mode 100644
index 494388ec9f39..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.59.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=4
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg jpeg2k png rle svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/netpbm-10.59.00.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6fe3161701d1472ed9abbd67bebe6fa7
diff --git a/metadata/md5-cache/media-video/pitivi-0.15.2 b/metadata/md5-cache/media-video/pitivi-0.15.2
new file mode 100644
index 000000000000..2a604cf1decc
--- /dev/null
+++ b/metadata/md5-cache/media-video/pitivi-0.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-python/pygtk-2.18:2 dev-python/pycairo >=media-libs/gstreamer-0.10.28:0.10 >=dev-python/gst-python-0.10.19:0.10 >=media-libs/gnonlin-0.10.16:0.10 >=x11-libs/gtk+-2.24.0:2 dev-python/dbus-python dev-python/pygoocanvas dev-python/pyxdg net-zope/zope-interface gnome-base/librsvg:= >=media-libs/gst-plugins-base-0.10.31:0.10 >=media-libs/gst-plugins-good-0.10.24:0.10 >=media-plugins/gst-plugins-ffmpeg-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10.31:0.10 >=media-plugins/gst-plugins-libpng-0.10.24:0.10 v4l? ( media-plugins/gst-plugins-v4l2:0.10 ) dev-python/setuptools sys-devel/gettext >=app-text/gnome-doc-utils-0.18.0 >=dev-util/intltool-0.35.5 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
+EAPI=5
+HOMEPAGE=http://www.pitivi.org
+IUSE=v4l 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 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/pygtk-2.18:2 dev-python/pycairo >=media-libs/gstreamer-0.10.28:0.10 >=dev-python/gst-python-0.10.19:0.10 >=media-libs/gnonlin-0.10.16:0.10 >=x11-libs/gtk+-2.24.0:2 dev-python/dbus-python dev-python/pygoocanvas dev-python/pyxdg net-zope/zope-interface gnome-base/librsvg:= >=media-libs/gst-plugins-base-0.10.31:0.10 >=media-libs/gst-plugins-good-0.10.24:0.10 >=media-plugins/gst-plugins-ffmpeg-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10.31:0.10 >=media-plugins/gst-plugins-libpng-0.10.24:0.10 v4l? ( media-plugins/gst-plugins-v4l2:0.10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/pitivi/0.15/pitivi-0.15.2.tar.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 96ca31031ada9967bcf96a4fd8977ae4 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b python-single-r1 ac5bf9438dc6ee497650a74d7a1402c2 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7d56ca4c15fc16f70d6ac763d4d2cfc6
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.1 b/metadata/md5-cache/net-ftp/lftp-4.4.1
deleted file mode 100644
index f7025eb99bb8..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=4
-HOMEPAGE=http://lftp.yar.ru/
-IUSE=linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW gnutls nls socks5 +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
-SLOT=0
-SRC_URI=http://ftp.yars.free.net/pub/source/lftp/lftp-4.4.1.tar.xz
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b8c60a1b500a9f084a86f8d8a3a6687e
diff --git a/metadata/md5-cache/net-libs/cyassl-2.0.8-r1 b/metadata/md5-cache/net-libs/cyassl-2.0.8-r1
deleted file mode 100644
index 6a426a7c1038..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=4
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-ni +hc128 +psk +ripemd sha512 +sessioncerts +testcert
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.0.8.zip
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bafd318ef0a301dc0a13fcf337e2a58f
diff --git a/metadata/md5-cache/net-libs/cyassl-2.2.0 b/metadata/md5-cache/net-libs/cyassl-2.2.0
deleted file mode 100644
index b0d0ec1c3316..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=4
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-ni +hc128 +psk +ripemd sha512 ocsp crl +sessioncerts +testcert
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.2.0.zip
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fce01daf210b1ccfdce6ca4c6fe83269
diff --git a/metadata/md5-cache/net-libs/cyassl-2.3.0 b/metadata/md5-cache/net-libs/cyassl-2.3.0
deleted file mode 100644
index 15c0bfc5a9c7..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=4
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512 ocsp crl crl-monitor +sessioncerts +testcert
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.3.0.zip
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1aea3c2e3f52ff22e6d6f70c09722e46
diff --git a/metadata/md5-cache/net-libs/cyassl-2.4.0 b/metadata/md5-cache/net-libs/cyassl-2.4.0
deleted file mode 100644
index 31da73105aca..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=4
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512 ocsp crl crl-monitor +sessioncerts +testcert
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.4.0.zip
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90aece260606779c08e9c64399075e56
diff --git a/metadata/md5-cache/net-libs/cyassl-2.5.0 b/metadata/md5-cache/net-libs/cyassl-2.5.0
new file mode 100644
index 000000000000..fc2a3050da88
--- /dev/null
+++ b/metadata/md5-cache/net-libs/cyassl-2.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib ) =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
+EAPI=5
+HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
+IUSE=debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-gcm aes-ccm aes-ni camellia +hc128 md2 +psk +ripemd sha512 ocsp crl crl-monitor +sessioncerts +testcert test
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.5.0.zip
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=14daa946263af4e1dccc4d4ace09806b
diff --git a/metadata/md5-cache/net-libs/libmapi-0.9 b/metadata/md5-cache/net-libs/libmapi-0.9
deleted file mode 100644
index 5379de434111..000000000000
--- a/metadata/md5-cache/net-libs/libmapi-0.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=net-fs/samba-4.0.0_alpha11 dev-lang/python
-DESCRIPTION=Portable open-source implementations of Exchange protocols.
-EAPI=2
-HOMEPAGE=http://www.openchange.org/
-IUSE=python
-LICENSE=GPL-3
-RDEPEND=>=net-fs/samba-4.0.0_alpha11 dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/openchange/openchange-0.9-COCHRANE.tar.gz
-_md5_=a16899956fb09c2b17ceaeaa070557b8
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.25 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.25
new file mode 100644
index 000000000000..c6770512517f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls ) test? ( ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) )
+DESCRIPTION=A small C library that makes it easy to run an HTTP server as part of another application.
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/libmicrohttpd/
+IUSE=messages ssl static-libs test
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls )
+SLOT=0
+SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.25.tar.gz
+_md5_=c5f9fc38da883c4a2d736ed848ca25d9
diff --git a/metadata/md5-cache/net-misc/dhcpcd-5.6.7 b/metadata/md5-cache/net-misc/dhcpcd-5.6.7
new file mode 100644
index 000000000000..0ec5ecc3c1c1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-5.6.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=4
+HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+IUSE=+zeroconf elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-5.6.7.tar.bz2
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b systemd 28706ddc21464b4ed255eee9fc70b516 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d5f19f7dd270c72af8b07afda3374e4b
diff --git a/metadata/md5-cache/net-misc/ipx-utils-1.1-r2 b/metadata/md5-cache/net-misc/ipx-utils-1.1-r2
deleted file mode 100644
index a093bb359c18..000000000000
--- a/metadata/md5-cache/net-misc/ipx-utils-1.1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The IPX Utilities
-HOMEPAGE=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/
-KEYWORDS=~amd64 ppc64 x86
-LICENSE=Caldera GPL-2
-SLOT=0
-SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/ipx-1.1.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c08448d5402c7e5c7e221eb45bb979b5
diff --git a/metadata/md5-cache/net-misc/ipx-utils-1.1-r3 b/metadata/md5-cache/net-misc/ipx-utils-1.1-r3
index 8c0c79a48a18..7d12975df49a 100644
--- a/metadata/md5-cache/net-misc/ipx-utils-1.1-r3
+++ b/metadata/md5-cache/net-misc/ipx-utils-1.1-r3
@@ -3,8 +3,8 @@ DESCRIPTION=The IPX Utilities
EAPI=4
HOMEPAGE=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/
KEYWORDS=amd64 ppc64 x86
-LICENSE=Caldera GPL-2
+LICENSE=ipx-utils GPL-2
SLOT=0
SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/ipx-1.1.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4804b6c35859b7c57917303200f124b7
+_md5_=f362f174a34052081b5a1d7924cf3950
diff --git a/metadata/md5-cache/net-misc/tor-0.2.4.10_alpha b/metadata/md5-cache/net-misc/tor-0.2.4.10_alpha
new file mode 100644
index 000000000000..05c02766a4b9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tor-0.2.4.10_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=4
+HOMEPAGE=http://www.torproject.org/
+IUSE=+bufferevents nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.4.10-alpha.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=50ed028f8db9d853228c67fd2b8c5b7f
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.0.1 b/metadata/md5-cache/sci-biology/shrimp-2.0.1
index 266e94ee397f..e28e948f422d 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.0.1
+++ b/metadata/md5-cache/sci-biology/shrimp-2.0.1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://compbio.cs.toronto.edu/shrimp/
IUSE=custom-cflags
KEYWORDS=amd64 x86
-LICENSE=as-is
+LICENSE=shrimp
RDEPEND=!sci-mathematics/cado-nfs
SLOT=0
SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_0_1.src.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b701337199eebbca3baf66c449639bb8
+_md5_=b1d8710e1b4893a318a15f55f8d15ecc
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.1.0 b/metadata/md5-cache/sci-biology/shrimp-2.1.0
index 268f66861121..2a5bbf9c763e 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.1.0
+++ b/metadata/md5-cache/sci-biology/shrimp-2.1.0
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://compbio.cs.toronto.edu/shrimp/
IUSE=custom-cflags
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=shrimp
RDEPEND=!sci-mathematics/cado-nfs
SLOT=0
SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_1_0.src.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8c6e0b3bb8caf53dda6fa2ad2c1c081
+_md5_=e7780d08c5795b1b5537e4079b1f3bed
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.2.3 b/metadata/md5-cache/sci-biology/shrimp-2.2.3
index fa00595ed35a..e6e48c098d0b 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.2.3
+++ b/metadata/md5-cache/sci-biology/shrimp-2.2.3
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://compbio.cs.toronto.edu/shrimp/
IUSE=custom-cflags
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=shrimp
RDEPEND=!sci-mathematics/cado-nfs =dev-lang/python-2*
SLOT=0
SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_2_3.src.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=630077d64f9e956e625909808278336a
+_md5_=50ce483c89c4081fd09fed6f49a30de3
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20120124 b/metadata/md5-cache/sci-chemistry/tm-align-20120124
index ed9f7c4c6395..9cbdf6f9ed62 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20120124
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20120124
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://zhanglab.ccmb.med.umich.edu/TM-align/
IUSE=static custom-cflags
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=as-is
+LICENSE=tm-align
RDEPEND=virtual/fortran
SLOT=0
SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20120124.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 19652e219ec9b62d7d89735821d7afb6 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f2f2a9470cfb6146fc75070a446850e
+_md5_=0041d5c111bc045c300acb1f463ae649
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20120707 b/metadata/md5-cache/sci-chemistry/tm-align-20120707
index 621b71c692f9..1cbf5eee5490 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20120707
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20120707
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://zhanglab.ccmb.med.umich.edu/TM-align/
IUSE=static custom-cflags
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=as-is
+LICENSE=tm-align
RDEPEND=virtual/fortran
SLOT=0
SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20120707.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 19652e219ec9b62d7d89735821d7afb6 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=30e6474999eb2faed6bf2cb1c1b8b6fe
+_md5_=3de0497ef8972c23b96e599005625540
diff --git a/metadata/md5-cache/sci-libs/buddy-2.2 b/metadata/md5-cache/sci-libs/buddy-2.2
index 96f025f9a62c..9e863536e85b 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.2
+++ b/metadata/md5-cache/sci-libs/buddy-2.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=Binary Decision Diagram Package
HOMEPAGE=http://www.itu.dk/research/buddy/
KEYWORDS=x86 ~ppc
-LICENSE=as-is
+LICENSE=buddy
SLOT=0
SRC_URI=http://www.itu.dk/research/buddy/buddy22.tar.gz
-_md5_=270d139f3aebc6cd595173336d85edf9
+_md5_=270e4c97aec5474318340fff1f492bee
diff --git a/metadata/md5-cache/sci-libs/buddy-2.4 b/metadata/md5-cache/sci-libs/buddy-2.4
index bcdb5f074a38..d93dd1355fb3 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.4
+++ b/metadata/md5-cache/sci-libs/buddy-2.4
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://sourceforge.net/projects/buddy/
IUSE=doc examples static-libs
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=as-is
+LICENSE=buddy
RDEPEND=virtual/fortran
SLOT=0
SRC_URI=mirror://sourceforge/buddy/buddy-2.4.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fortran-2 19652e219ec9b62d7d89735821d7afb6 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=64af063d3ed564be152e9548f0b44f6e
+_md5_=0f326bbdd94b62898613d2a865604469
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.3.0 b/metadata/md5-cache/sci-libs/cminpack-1.3.0
index 10aa155f2d48..b2723bb506bd 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.3.0
+++ b/metadata/md5-cache/sci-libs/cminpack-1.3.0
@@ -5,8 +5,8 @@ EAPI=4
HOMEPAGE=http://devernay.free.fr/hacks/cminpack/
IUSE=doc test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
+LICENSE=minpack
SLOT=0
SRC_URI=http://devernay.free.fr/hacks/cminpack//cminpack-1.3.0.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=41fae8c48fee058c5e3cd6b1bd0880ea
+_md5_=623c3dc7c0c75852e50ae8d19f5095d5
diff --git a/metadata/md5-cache/sci-libs/cmpfit-1.2 b/metadata/md5-cache/sci-libs/cmpfit-1.2
index 7064efe518ec..08742a63a1be 100644
--- a/metadata/md5-cache/sci-libs/cmpfit-1.2
+++ b/metadata/md5-cache/sci-libs/cmpfit-1.2
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.physics.wisc.edu/~craigm/idl/cmpfit.html
IUSE=static-libs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=as-is
+LICENSE=public-domain minpack
SLOT=0
SRC_URI=http://www.physics.wisc.edu/~craigm/idl/down/cmpfit-1.2.tar.gz
_eclasses_=multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=248282982a83a55e4e908d07e33043cf
+_md5_=95de2a9360eb37cef7e7fdbc76bf776d
diff --git a/metadata/md5-cache/sys-apps/kmod-12-r1 b/metadata/md5-cache/sys-apps/kmod-12-r1
index 42ac42702076..b97a27b2e4e0 100644
--- a/metadata/md5-cache/sys-apps/kmod-12-r1
+++ b/metadata/md5-cache/sys-apps/kmod-12-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install prepare setup
DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=library and tools for managing linux kernel modules
EAPI=4
@@ -10,5 +10,5 @@ RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-uti
RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-12.tar.xz
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c80d21d0d543cc515045b73be5579c4
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=4aff89857ad49d2d78ac048d88554ebd
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 1b3752d5e3aa..f883ea803f7f 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install prepare setup unpack
DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( 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 dev-vcs/git
DESCRIPTION=library and tools for managing linux kernel modules
EAPI=4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 )
RESTRICT=test
SLOT=0
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=65b566387e3fff6e90a69ae623f2f55f
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=14f16a123567580936c6f12f77f5fd1d
diff --git a/metadata/md5-cache/sys-apps/nawk-20110810-r1 b/metadata/md5-cache/sys-apps/nawk-20110810-r1
index 629874edb18e..79aaa4cbe40f 100644
--- a/metadata/md5-cache/sys-apps/nawk-20110810-r1
+++ b/metadata/md5-cache/sys-apps/nawk-20110810-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-macos
LICENSE=MIT
RDEPEND=app-admin/eselect-awk
SLOT=0
-SRC_URI=http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz -> nawk-20110810.tar.gz
+SRC_URI=mirror://gentoo.org/nawk-20110810.tar.gz
_eclasses_=multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
-_md5_=e4e3b186aa80723af7d29c18abcb5f63
+_md5_=379631c56870de3f57c6c14a4c6ed75d
diff --git a/metadata/md5-cache/sys-apps/nawk-20121220-r1 b/metadata/md5-cache/sys-apps/nawk-20121220-r1
new file mode 100644
index 000000000000..1b38706229fa
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nawk-20121220-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-admin/eselect-awk virtual/yacc
+DESCRIPTION=Brian Kernighan's pattern scanning and processing language
+EAPI=4
+HOMEPAGE=http://cm.bell-labs.com/cm/cs/awkbook/index.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-macos
+LICENSE=MIT
+RDEPEND=app-admin/eselect-awk
+SLOT=0
+SRC_URI=mirror://gentoo.org/nawk-20121220.tar.gz
+_eclasses_=multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e
+_md5_=d6a26f727b617259b15073834479d763
diff --git a/metadata/md5-cache/sys-apps/paludis-0.66.0 b/metadata/md5-cache/sys-apps/paludis-0.66.0
deleted file mode 100644
index 15cc12557318..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.66.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax dev-ruby/allison ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.pioto.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.pioto.org/download/paludis-0.66.0.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70a0abd9477aebdfcf39044a0b4ed9da
diff --git a/metadata/md5-cache/sys-apps/paludis-0.68.0 b/metadata/md5-cache/sys-apps/paludis-0.68.0
deleted file mode 100644
index 82c4f9363215..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.68.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax dev-ruby/allison ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.pioto.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.pioto.org/download/paludis-0.68.0.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c3a14c9bf3d734a096bc8a60e400f967
diff --git a/metadata/md5-cache/sys-apps/paludis-0.70.2 b/metadata/md5-cache/sys-apps/paludis-0.70.2
deleted file mode 100644
index 4dea951b1263..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.70.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax dev-ruby/allison ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.pioto.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.pioto.org/download/paludis-0.70.2.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d68fef269cb947b99166db8385ac97e
diff --git a/metadata/md5-cache/sys-apps/paludis-0.72.2 b/metadata/md5-cache/sys-apps/paludis-0.72.2
deleted file mode 100644
index 79ab68b643c0..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.72.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax dev-ruby/allison ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.exherbo.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.exherbo.org/download/paludis-0.72.2.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=95a65f8c4f2e159b7ac7d121675a16f9
diff --git a/metadata/md5-cache/sys-apps/paludis-0.74.1 b/metadata/md5-cache/sys-apps/paludis-0.74.1
deleted file mode 100644
index ad5487cc8d15..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.74.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax dev-ruby/allison ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.exherbo.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.exherbo.org/download/paludis-0.74.1.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4088ac36b7456c899865e08669138df0
diff --git a/metadata/md5-cache/sys-apps/paludis-0.76.0 b/metadata/md5-cache/sys-apps/paludis-0.76.0
deleted file mode 100644
index 36d970436a3c..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.76.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax ) ) virtual/pkgconfig dev-cpp/gtest
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.exherbo.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.exherbo.org/download/paludis-0.76.0.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=06135358075171bb4b47050124130996
diff --git a/metadata/md5-cache/sys-apps/paludis-0.78.2 b/metadata/md5-cache/sys-apps/paludis-0.78.2
deleted file mode 100644
index 50d96b5a1871..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.78.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax ) ) virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.exherbo.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index test vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.exherbo.org/download/paludis-0.78.2.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a19a4ef301ae80f42dcb133d99d49fa6
diff --git a/metadata/md5-cache/sys-apps/paludis-0.80.2 b/metadata/md5-cache/sys-apps/paludis-0.80.2
deleted file mode 100644
index 7d04d45512f2..000000000000
--- a/metadata/md5-cache/sys-apps/paludis-0.80.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) !prebuilt-documentation? ( >=app-text/asciidoc-8.6.3 app-text/xmlto ) doc? ( || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 ) media-gfx/imagemagick python-bindings? ( dev-python/epydoc dev-python/pygments ) ruby-bindings? ( dev-ruby/syntax ) ) virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=paludis, the other package mangler
-HOMEPAGE=http://paludis.exherbo.org/
-IUSE=doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index test vim-syntax visibility xml zsh-completion bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 vim-syntax? ( vim )
-PDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) app-admin/eselect-package-manager bash-completion? ( app-shells/bash-completion )
-RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2 >=sys-devel/gcc-4.4 dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-3.0.4 ) python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 ) sys-apps/sandbox bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=http://paludis.exherbo.org/download/paludis-0.80.2.tar.bz2
-_eclasses_=bash-completion 003731da0df19d26955927bd534f3058 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e59990de2b74543603925a684864046a
diff --git a/metadata/md5-cache/sys-boot/grub-2.00-r2 b/metadata/md5-cache/sys-boot/grub-2.00-r2
index 741f6a33efe8..d5f162b0265a 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.00-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare pretend
-DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=GNU GRUB boot loader
EAPI=4
HOMEPAGE=http://www.gnu.org/software/grub/
IUSE=custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs grub_platforms_emu grub_platforms_qemu-mips grub_platforms_yeeloong grub_platforms_ieee1275 grub_platforms_coreboot grub_platforms_multiboot grub_platforms_efi-32 grub_platforms_pc grub_platforms_qemu grub_platforms_efi-64
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
-REQUIRED_USE=grub_platforms_qemu? ( truetype )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) )
+REQUIRED_USE=grub_platforms_qemu? ( truetype ) grub_platforms_yeeloong? ( truetype )
SLOT=2
SRC_URI=mirror://gnu/grub/grub-2.00.tar.xz mirror://gentoo/grub-2.00.tar.xz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f4b9af533317de951af495ba658f433
+_md5_=df2799b23b880525d757d9fb3f514323
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 4737f07985b6..25f7488bc99e 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend unpack
DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
DESCRIPTION=GNU GRUB boot loader
EAPI=4
HOMEPAGE=http://www.gnu.org/software/grub/
IUSE=custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs grub_platforms_emu grub_platforms_qemu-mips grub_platforms_yeeloong grub_platforms_ieee1275 grub_platforms_coreboot grub_platforms_multiboot grub_platforms_efi-32 grub_platforms_pc grub_platforms_qemu grub_platforms_efi-64
LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
-REQUIRED_USE=grub_platforms_qemu? ( truetype )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) )
+REQUIRED_USE=grub_platforms_qemu? ( truetype ) grub_platforms_yeeloong? ( truetype )
SLOT=2
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 bzr 876798528c0cd872742b74bf784738cf eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fd7c1642fc11715c6388c0a91fae528c
+_md5_=8ede0cf42591b3fc49e6c40169a07c80
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-23 b/metadata/md5-cache/sys-fs/udev-init-scripts-23
new file mode 100644
index 000000000000..14ac34885811
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=virtual/pkgconfig
+DESCRIPTION=udev startup scripts for openrc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/udev-180 sys-apps/openrc !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk 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 virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs
KEYWORDS=~amd64
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc10* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
+RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc10* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc10.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=0678e990a00a3eaa191e71b99a1ab7eb
+_md5_=825ef5ee2ed1d0e3485d6eb3abefab8d
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r2 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
similarity index 66%
rename from metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r2
rename to metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
index 5b5bbc790a49..068f462a7700 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc11-r3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] 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 virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk 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 virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs
KEYWORDS=~amd64
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc11* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
+RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc11* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=d93b5e73651ec10748c417f5c73fdc97
+_md5_=fc61e3f5940b88bc1dd0765f687deabb
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r2 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
similarity index 66%
rename from metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r2
rename to metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
index e5acb54ab52a..4c38507459eb 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc12-r3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] 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 virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk 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 virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs
KEYWORDS=~amd64
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc12* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
+RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc12* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=f31b47345e0d6c71ff14d39b44a2f38b
+_md5_=529fb82868f015ff6b1fe6045bf065db
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r1 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
similarity index 66%
rename from metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r1
rename to metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
index 4c2819e394d8..a21a87bfa2cb 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc13-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] 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 virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk 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 virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs
KEYWORDS=~amd64
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc13* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
+RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc13* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=6804e8a077e9f83fdfd857c66adbe209
+_md5_=ad4405bcbe1f9784ee732fd301506101
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
similarity index 65%
rename from metadata/md5-cache/sys-fs/zfs-0.6.0_rc14
rename to metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
index ac4067e7a984..0e8c2562a5ef 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] 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 virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk 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 virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs
KEYWORDS=~amd64
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.6.0_rc14* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
DESCRIPTION=Userland utilities for ZFS Linux kernel module
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags kernel-builtin +rootfs test-suite static-libs kernel_linux
LICENSE=BSD-2 CDDL MIT
-RDEPEND=sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc10* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc10* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc10* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc10.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=53e9f5ea564f493933d1d7ce27ec6913
+_md5_=86dcd0284ec339e9fa557aab09aeaad8
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11
index 412e5b964e3f..981185105f8f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc11* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc11* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc11* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc11* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=819567815e0d457ce185f318847b2c80
+_md5_=0b9c25d4762cb77f71f99203097d677e
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r1
index 63b3496693d5..3d94534ca183 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc11-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc11* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc11* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc11* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc11* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=caaa77f3dafb834ad582938f85b7dec5
+_md5_=e1ae543f9c6105d39a79f02f397ca846
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12
index cc9f3dd944f7..b19767e8f712 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc12* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc12* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc12* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc12* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e3944b4c16e6f8f33e91dd02c08e8646
+_md5_=d0abfeb013226037b76789961a1cf167
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r1
index 11a0f6b11b86..2875cf2f7b7a 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc12-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc12* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc12* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc12* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc12* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz http://dev.gentoo.org/~ryao/dist/zfs-kmod-0.6.0-rc12-p0.tar.xz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=167cc830f01c518f61aa3bff4583a913
+_md5_=ff6407d5682acc3190b02ac56411a37e
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13
index 2cff1d63eba0..f12c08d5ec04 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc13* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc13* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=6e004c2ac65be7aa4c50727547cfae02
+_md5_=15d62546ff786939efd2d1d1ad054f54
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r1
index 30c8d5bc705a..ad19371b6b02 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc13* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc13* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=9eb12cca0d73f22ba978d4fb2f99a4ff
+_md5_=2fab22fe4dc3f4263e35e72ade947dbf
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r2 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r2
index 00284a693621..849dedba5aeb 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r2
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc13-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc13* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc13* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc13* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc8a755ae3bc6f190032642c7bd7767f
+_md5_=fe59c948e1b7452b6b4f213772dd4c42
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r1
similarity index 70%
rename from metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14
rename to metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r1
index ea77d8b7cdae..52dc3b370e8f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.0_rc14-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc14* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==sys-kernel/spl-0.6.0_rc14* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
KEYWORDS=~amd64
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-0.6.0_rc14* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.6.0_rc14* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.0-rc14.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=29fd3ffc394116cc7f12fe1d6b0b6963
+_md5_=61f2011c9b4d42576af82f6cdf1b0f74
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 15f0235d15cd..aa904656a4b1 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND==sys-kernel/spl-9999* kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND==sys-kernel/spl-9999* virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug +rootfs kernel_linux
LICENSE=CDDL
-RDEPEND==sys-kernel/spl-9999* !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-9999* virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=c4169fdecfd7a741ab8fa26964b6c8d7
+_md5_=8a677bc07e94991f29be3a380582eb1d
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20130113 b/metadata/md5-cache/sys-kernel/linux-firmware-20130113
new file mode 100644
index 000000000000..e6fca1814037
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20130113
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=Linux firmware files
+EAPI=5
+HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=savedconfig savedconfig
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
+RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !x11-drivers/radeon-ucode )
+SLOT=0
+SRC_URI=mirror://gentoo/linux-firmware-20130113.tar.xz
+_eclasses_=portability 536c5e70c5fb252ed3b769e04aa3f05b savedconfig 5313100f525c41f6c72c6e04edeb4f65
+_md5_=89d605bd813deaf99d92d00cb0a1210d
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 2a06897bbf7c..eae94077cc34 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -1,11 +1,11 @@
DEFINED_PHASES=install postinst preinst prepare unpack
DEPEND=dev-vcs/git
DESCRIPTION=Linux firmware files
-EAPI=4
+EAPI=5
HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
IUSE=savedconfig savedconfig
LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !x11-drivers/radeon-ucode )
SLOT=0
_eclasses_=git-2 e92e09651292b1bef5656592364550f7 portability 536c5e70c5fb252ed3b769e04aa3f05b savedconfig 5313100f525c41f6c72c6e04edeb4f65
-_md5_=aa5d158dd4ed246ee5e8a237df1cc721
+_md5_=fad98c40418f659cd600d66b94731002
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
index 3ae2d92f34d4..ae993888f8ec 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc10
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc10.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=9db6374607bee35f854a7b7ec5b31be5
+_md5_=bc6b7f43736c3e7a65525ac59c9b5cf5
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11
index 49347cd75c5d..f4130ae079f2 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=c989f1dd00a508fcf272e6d3c7e0f6b2
+_md5_=b92abbb0a3540530a318a426c6b03432
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
index ba384ca8f900..69325b8cd56a 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc11-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=82753a1ec14bde23b1dbcf98db55f68d
+_md5_=73ddf77c8ba82b6590664b79cd506307
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12
index 6a5057faa765..2e5d65d25bd2 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=21c4919309779bfeb7ab55a803aee70d
+_md5_=6bf8a7384cfafb7a24f6299fcd55c3cf
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
index 7773218f16a8..ea02c6af7a66 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc12-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=2e0dd5034f6289b22ecf67052cd4f2c3
+_md5_=c4a9ce08ab4b021e5183811785f7b81a
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13
index 6e3d6d2036f2..bd8f40ab982e 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=61e4e900f67d217e0cea103593ac356f
+_md5_=1527934be9f92b01aa305719851adc09
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r1 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r1
index 8d7da4da9312..07340436caef 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r1
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=fb8db2d9c76c8994d573a657632b169c
+_md5_=4c8b5561ca59658569c962f9ee273309
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
index fec774780066..9757d28264cf 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc13-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc13.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ababecfd35751faccb379b53f78c6f81
+_md5_=90869690e01f7a16e4de63fe88e512c7
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r1
similarity index 74%
rename from metadata/md5-cache/sys-kernel/spl-0.6.0_rc14
rename to metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r1
index 67e6449fea1e..636d2a996332 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc14-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
KEYWORDS=~amd64
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/spl/archive/spl-0.6.0-rc14.tar.gz
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7a597dbf2467af7b63603c4e1d747ef3
+_md5_=4478c45506c146efa7b27be6e030f3ae
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index 3ed7c81d8a6b..d2f14d269134 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
DESCRIPTION=The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug debug-log kernel_linux
LICENSE=GPL-2
-RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=test
SLOT=0
_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac linux-info c27564a568491445be036a10498ed8be linux-mod dbc722ed035721476f23ab7b0572985e multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=8b6304def173a5035c1913cea9b236f3
+_md5_=c5d041e7cb2991078ae3ee5fc0bbd33a
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.0 b/metadata/md5-cache/sys-libs/libosinfo-0.2.0
deleted file mode 100644
index 289c937009a7..000000000000
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2 >=dev-libs/libxslt-1.0.0 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
-DESCRIPTION=GObject library for managing information about real and virtual OSes
-EAPI=4
-HOMEPAGE=http://fedorahosted.org/libosinfo/
-IUSE=doc +introspection +vala test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 >=dev-libs/libxslt-1.0.0 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.0.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 vala ad1e7234faa2244a7e10f1c864371475
-_md5_=31748f41bc9a91fb50c89fa9b53992c6
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.1 b/metadata/md5-cache/sys-libs/libosinfo-0.2.1
deleted file mode 100644
index 547b8fd7c506..000000000000
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
-DESCRIPTION=GObject library for managing information about real and virtual OSes
-EAPI=4
-HOMEPAGE=http://fedorahosted.org/libosinfo/
-IUSE=+introspection +vala test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.1.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 vala ad1e7234faa2244a7e10f1c864371475
-_md5_=1084fd867bb70a25bb1ef0c861b6851c
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.3 b/metadata/md5-cache/sys-libs/libosinfo-0.2.3
new file mode 100644
index 000000000000..ff39c617cc12
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) virtual/pkgconfig
+DESCRIPTION=GObject library for managing information about real and virtual OSes
+EAPI=5
+HOMEPAGE=http://fedorahosted.org/libosinfo/
+IUSE=+introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.3.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e udev fea2246732f911905d6991fed203e65c user d0a4d0735a6c0183d707ca919bd72f28 vala ad1e7234faa2244a7e10f1c864371475
+_md5_=d8161dea43b0697e15800e40ec711f1f
diff --git a/metadata/md5-cache/www-client/chromium-24.0.1312.52 b/metadata/md5-cache/www-client/chromium-24.0.1312.52
deleted file mode 100644
index d6c7eeb8813c..000000000000
--- a/metadata/md5-cache/www-client/chromium-24.0.1312.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2
-_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7f6b20444a52cfb6502dd2d4b5853e6c
diff --git a/metadata/md5-cache/www-client/chromium-24.0.1312.56 b/metadata/md5-cache/www-client/chromium-24.0.1312.56
index 1e71054edbd0..2fbe4b6e3a7a 100644
--- a/metadata/md5-cache/www-client/chromium-24.0.1312.56
+++ b/metadata/md5-cache/www-client/chromium-24.0.1312.56
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= =dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=5
HOMEPAGE=http://chromium.org/
IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
KEYWORDS=amd64 x86
LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= =dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=0
SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.56.tar.bz2
_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f2fe803c8e010c1c1c694e79b863c850
+_md5_=fdbb3e0698a77dcfb5d5530a3b320068
diff --git a/metadata/md5-cache/www-client/chromium-25.0.1364.45 b/metadata/md5-cache/www-client/chromium-25.0.1364.68
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-25.0.1364.45
rename to metadata/md5-cache/www-client/chromium-25.0.1364.68
index 6ef3e3a2e91b..e5c36d046d61 100644
--- a/metadata/md5-cache/www-client/chromium-25.0.1364.45
+++ b/metadata/md5-cache/www-client/chromium-25.0.1364.68
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=app-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.15.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 dev-libs/protobuf gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0 ) >=net-libs/libsrtp-1.4.4_p20121108 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.45-lite.tar.bz2
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68-lite.tar.bz2
_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python e5b3412fa9f03670a666c8a137bd1060 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=913d825c42b2dd21b2e85adffc74ab75
+_md5_=cb187638df3bd8907b521a43236a7ce8
diff --git a/metadata/md5-cache/www-client/google-chrome-25.0.1364.58_beta179520 b/metadata/md5-cache/www-client/google-chrome-25.0.1364.68_beta180609
similarity index 93%
rename from metadata/md5-cache/www-client/google-chrome-25.0.1364.58_beta179520
rename to metadata/md5-cache/www-client/google-chrome-25.0.1364.68_beta180609
index 6a09d42dd75f..efa7dfcc69d6 100644
--- a/metadata/md5-cache/www-client/google-chrome-25.0.1364.58_beta179520
+++ b/metadata/md5-cache/www-client/google-chrome-25.0.1364.68_beta180609
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:stable !www-client/google-chrome:unstable
RESTRICT=bindist mirror strip
SLOT=beta
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_25.0.1364.58-r179520_amd64.deb mirror://gentoo/google-chrome-libudev-0.13.1-amd64.tar.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_25.0.1364.58-r179520_i386.deb mirror://gentoo/google-chrome-libudev-0.13.1-x86.tar.xz )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_25.0.1364.68-r180609_amd64.deb mirror://gentoo/google-chrome-libudev-0.13.1-amd64.tar.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_25.0.1364.68-r180609_i386.deb mirror://gentoo/google-chrome-libudev-0.13.1-x86.tar.xz )
_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info c27564a568491445be036a10498ed8be multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7935e382f1e870a70a6fe6994d5a82d6
+_md5_=1bce512e5385e2a7c136f3c35451516b
diff --git a/metadata/md5-cache/www-client/opera-12.14_pre1737 b/metadata/md5-cache/www-client/opera-12.14_p1738
similarity index 84%
rename from metadata/md5-cache/www-client/opera-12.14_pre1737
rename to metadata/md5-cache/www-client/opera-12.14_p1738
index 047e2338767d..0a9188a86903 100644
--- a/metadata/md5-cache/www-client/opera-12.14_pre1737
+++ b/metadata/md5-cache/www-client/opera-12.14_p1738
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd
LICENSE=OPERA-12 LGPL-2 LGPL-3
RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core:4 x11-libs/qt-gui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 )
SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/BlackOoops_12.14-1737/opera-12.14-1737.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/BlackOoops_12.14-1737/opera-12.14-1737.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/BlackOoops_12.14-1737/opera-12.14-1737.i386.freebsd.tar.xz )
+SRC_URI=amd64? ( mirror://opera/linux/1214/opera-12.14-1738.x86_64.linux.tar.xz ) x86? ( mirror://opera/linux/1214/opera-12.14-1738.i386.linux.tar.xz ) x86-fbsd? ( mirror://opera/unix/1214/opera-12.14-1738.i386.freebsd.tar.xz )
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=62d3411002d0c3b1666dbf5b3111ed68
+_md5_=efddd0c70c1025a48042c056edebf2f4
diff --git a/metadata/md5-cache/www-client/opera-next-12.14_pre1737 b/metadata/md5-cache/www-client/opera-next-12.14_pre1737
new file mode 100644
index 000000000000..b4aa8652d390
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-next-12.14_pre1737
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://www.opera.com/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-12 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core:4 x11-libs/qt-gui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/BlackOops_12.14-1737/opera-next-12.14-1737.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/BlackOops_12.14-1737/opera-next-12.14-1737.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/BlackOops_12.14-1737/opera-next-12.14-1737.i386.freebsd.tar.xz )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib ded93e450747134a079e647d888aa80b pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=5fefbfd4b5d3c7df7e2eb6b26d386da8
diff --git a/metadata/md5-cache/www-servers/tornado-2.4-r1 b/metadata/md5-cache/www-servers/tornado-2.4-r1
new file mode 100644
index 000000000000..811c140958ef
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tornado-2.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=curl? ( dev-python/pycurl[python_targets_python2_5(-)?,-python_single_target_python2_5(-),python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Scalable, non-blocking web server and tools
+EAPI=5
+HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
+IUSE=curl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_5(-)?,-python_single_target_python2_5(-),python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=curl? ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.tar.gz
+_eclasses_=distutils-r1 88c04402d2e6e306290ca673b9c4e997 eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 048b50bedc7713734694d95a872490a6 python-utils-r1 120bfd06803274b3d1b986d506302851 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=476ac83f18521df1fc6784df62a89f77
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.1.2 b/metadata/md5-cache/x11-apps/xbacklight-1.1.2
deleted file mode 100644
index 2fcd93ced6ab..000000000000
--- a/metadata/md5-cache/x11-apps/xbacklight-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrandr-1.2 x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Sets backlight level using the RandR 1.2 BACKLIGHT output property
-EAPI=3
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXrandr-1.2 x11-libs/libX11
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.2.tar.bz2
-_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 d30f1102ace76e02c79c9d0a62f13ca3
-_md5_=a2b90972d3e29bfb6f9d2187f0b98823
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.12 b/metadata/md5-cache/x11-libs/cairo-1.12.12
new file mode 100644
index 000000000000..6817ff4fca7f
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=x11-libs/qt-gui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) virtual/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.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 vector graphics library with cross-device output support
+EAPI=5
+HOMEPAGE=http://cairographics.org/
+IUSE=X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.28.0 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=x11-libs/qt-gui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
+REQUIRED_USE=drm? ( X ) gallium? ( drm )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://cairographics.org/releases/cairo-1.12.12.tar.xz
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=417b99f969b590f1cfe57e5cc9fd1b4a
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.42 b/metadata/md5-cache/x11-libs/libdrm-2.4.42
new file mode 100644
index 000000000000..ee5ab7b6f368
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X.Org libdrm library
+EAPI=5
+HOMEPAGE=http://dri.freedesktop.org/
+IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.42.tar.bz2
+_eclasses_=autotools cf83655b19ed98f9ea3b44f4572b51a3 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool 2b273eea1976cfaed3449345d94331ac multilib ded93e450747134a079e647d888aa80b multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 d30f1102ace76e02c79c9d0a62f13ca3
+_md5_=f7bdb223ed537aeb1f2f20a76e28d9a4
diff --git a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3 b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3
new file mode 100644
index 000000000000..821b229a6150
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=x11-libs/gtk+:2 gnome-base/libglade virtual/pkgconfig sys-devel/flex virtual/yacc
+DESCRIPTION=A small utility for fast and easy GUI building
+EAPI=4
+HOMEPAGE=http://code.google.com/p/gtkdialog/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 gnome-base/libglade
+SLOT=0
+SRC_URI=http://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz
+_md5_=e58305deafc53cf4c0159adbee180c9a
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.1-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.3.1-r1
deleted file mode 100644
index 980f4e505d19..000000000000
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs ) virtual/opengl >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
-EAPI=4
-HOMEPAGE=http://www.virtualgl.org/
-IUSE=multilib ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs ) virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.1/VirtualGL-2.3.1.tar.gz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ccf8c22df448e49e2c9c0e0f36e05419
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.2 b/metadata/md5-cache/x11-misc/virtualgl-2.3.2
index 39fb18048088..96f3e5717006 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.2
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.3.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs ) virtual/glu virtual/opengl >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl ) virtual/glu virtual/opengl >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
EAPI=4
HOMEPAGE=http://www.virtualgl.org/
IUSE=multilib ssl
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs ) virtual/glu virtual/opengl
+RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl ) virtual/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.2/VirtualGL-2.3.2.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d38134d1ed4625ea26d98bae9cfb6a8
+_md5_=6dde2d303d6e5af9d82269b879ae1fd2
diff --git a/metadata/md5-cache/x11-plugins/vicious-2.1.0-r1 b/metadata/md5-cache/x11-plugins/vicious-2.1.0-r1
new file mode 100644
index 000000000000..e3df7c43994e
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/vicious-2.1.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Modular widget library for x11-wm/awesome
+EAPI=5
+HOMEPAGE=http://awesome.naquadah.org/wiki/Vicious
+IUSE=contrib
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=x11-wm/awesome
+SLOT=0
+SRC_URI=http://git.sysphere.org/vicious/snapshot/vicious-2.1.0.tar.xz
+_md5_=200b2289582e5397054f958b69fa52cf
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5 b/metadata/md5-cache/x11-wm/awesome-3.5
deleted file mode 100644
index b8b23c30700f..000000000000
--- a/metadata/md5-cache/x11-wm/awesome-3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/lua-5.1 >=dev-libs/libxdg-basedir-1 x11-libs/cairo[xcb] || ( =x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.6 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/libXcursor x11-libs/gdk-pixbuf:2 dev-libs/glib:2 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=dev-lua/lgi-0.6.1 >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen dev-lua/luadoc media-gfx/graphviz ) >=dev-util/cmake-2.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A dynamic floating and tiling window manager
-EAPI=5
-HOMEPAGE=http://awesome.naquadah.org/
-IUSE=dbus doc elibc_FreeBSD gnome
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1 >=dev-libs/libxdg-basedir-1 x11-libs/cairo[xcb] || ( =x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.6 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/libXcursor x11-libs/gdk-pixbuf:2 dev-libs/glib:2 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=dev-lua/lgi-0.6.1 || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick[X] media-gfx/graphicsmagick[imagemagick,X] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
-SLOT=0
-SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.tar.xz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e1ccbcc86c2832ecd2fcb645851a2df3
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5-r1 b/metadata/md5-cache/x11-wm/awesome-3.5-r1
new file mode 100644
index 000000000000..08c06695f593
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/awesome-3.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=dev-lang/lua-5.1 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.6.1 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/libXcursor || ( =x11-libs/libX11-1.3.99.901 ) dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) >=app-text/asciidoc-8.4.5 app-text/xmlto dev-util/gperf virtual/pkgconfig media-gfx/imagemagick[png] >=x11-proto/xcb-proto-1.5 >=x11-proto/xproto-7.0.15 doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/cmake-2.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A dynamic floating and tiling window manager
+EAPI=5
+HOMEPAGE=http://awesome.naquadah.org/
+IUSE=dbus doc elibc_FreeBSD gnome
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/lua-5.1 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.6.1 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/libXcursor || ( =x11-libs/libX11-1.3.99.901 ) dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
+SLOT=0
+SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.tar.xz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 3cb7a29aafd4b984d2bf12bc50abe5da eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib ded93e450747134a079e647d888aa80b toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5c11e4690c1460f19851633a3df39bc4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 85adb547eed1..e0117e3d2e79 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Feb 2013 14:06:58 +0000
+Wed, 06 Feb 2013 04:06:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d13e948ff792..12e3a2604ddd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 5 14:06:56 UTC 2013
+Wed Feb 6 04:06:52 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8cd86d75174c..04c6530d5ef3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Feb 2013 14:30:01 +0000
+Wed, 06 Feb 2013 04:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e42894da2a30..5ad2f45a2775 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1360073101 Tue Feb 5 14:05:01 2013 UTC
+1360123501 Wed Feb 6 04:05:01 2013 UTC
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index d180f187cbb2..439ec076ab6a 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,3 +1,2 @@
DIST lftp-4.4.0.tar.xz 1428284 SHA256 c79326af45f2f51a5e590d2691f64b3885b3516e0c2c01f97a5e0be5977ae431 SHA512 08386bd1dd61690f615e2a40c0a5c442256bb22bd5e18dea7525c5b25a3a293c5d498f8bd6395f89b22eb5bc7542797d2619e3ea1529b7b1b54d10ed98923621 WHIRLPOOL 27ab86e77f0e7e52e68367529e830f2d4227d6caa8cad3a928da8ec96c9671c3fd1601a5ef447c72b7db0795592406577031d41fadd4748b963dd3d986ddd19a
-DIST lftp-4.4.1.tar.xz 1425908 SHA256 487ae13fdbcab20b15066ee02ff86d7aa4a3627a3b820085c426f954f0afe8d8 SHA512 85ac417c486693a4c1500d77a864eb55db71871a4353fc795999de877c2788966cec704454b9760a34894dee794283c1a5f4cf221b5784aa4e6ec51d8638ba60 WHIRLPOOL 25186a783211c8fe1740dae6ae3559a63c190e50f6a5afb06840b3038ec948d1c37d3342b69bece946f3ac71969e7d49e4c17a7b002229c8cf6ab484a05eef35
DIST lftp-4.4.2.tar.xz 1425904 SHA256 e1d1397a252c44c8ef452e865d31869637ca30f13fb919530569cff69231f694 SHA512 0f995b77bbb48ccc16c8f330985c394eb6f6ef87eac8d39120fd34b567b3e1096cf996c0931815f7ac9e8618858a8acc001e48f628d138b56e8bafc22edc893e WHIRLPOOL b01c91c74e3baf72a3c527fe01ebcac605bb0c835a528585d105dc845806f29c31cb622ded48ed4afe004e29ca316ff37d10bda3b412472b564b77b2082db91f
diff --git a/net-ftp/lftp/lftp-4.4.1.ebuild b/net-ftp/lftp/lftp-4.4.1.ebuild
deleted file mode 100644
index df8a66b1dc91..000000000000
--- a/net-ftp/lftp/lftp-4.4.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.1.ebuild,v 1.1 2013/01/29 17:18:39 jer Exp $
-
-EAPI=4
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-LFTP_LINGUAS="cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW"
-
-IUSE="
- $( for i in ${LFTP_LINGUAS}; do echo linguas_${i}; done )
- gnutls nls socks5 +ssl
-"
-
-RDEPEND="
- dev-libs/expat
- >=sys-libs/ncurses-5.1
- socks5? (
- >=net-proxy/dante-1.1.12
- virtual/pam )
- ssl? (
- gnutls? ( >=net-libs/gnutls-1.2.3 )
- !gnutls? ( >=dev-libs/openssl-0.9.6 )
- )
- >=sys-libs/readline-5.1
-"
-
-DEPEND="
- ${RDEPEND}
- =sys-devel/libtool-2*
- app-arch/xz-utils
- dev-lang/perl
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-DOCS=(
- BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
- README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
- "${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
- "${FILESDIR}/${PN}-4.3.8-gets.patch"
- eautoreconf
- elibtoolize # for Darwin bundles
-}
-
-src_configure() {
- local myconf=""
-
- if use ssl && use gnutls ; then
- myconf="${myconf} --without-openssl"
- elif use ssl && ! use gnutls ; then
- myconf="${myconf} --without-gnutls --with-openssl=${EPREFIX}/usr"
- else
- myconf="${myconf} --without-gnutls --without-openssl"
- fi
-
- use socks5 && myconf="${myconf} --with-socksdante=${EPREFIX}/usr" \
- || myconf="${myconf} --without-socksdante"
-
- econf \
- $(use_enable nls) \
- ${myconf} \
- --enable-packager-mode \
- --sysconfdir="${EPREFIX}"/etc/${PN} \
- --with-modules
-}
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
index f3f3fc0cb20e..54755e4fb4cc 100644
--- a/net-libs/cyassl/Manifest
+++ b/net-libs/cyassl/Manifest
@@ -1,5 +1,2 @@
-DIST cyassl-2.0.8.zip 894570 SHA256 bcf26384f155c5fe2fdec82eea41894b7742fc39c651d6c52e80824f63a4a09b SHA512 60b24ae9b658ba5fd75835ed9066d418b51ed8c881a2333e627d65285019491d98fddd77c5cea43b07e454765c420024e3ed158d6d731e182bbe332c830ece43 WHIRLPOOL 3ec147fb2759c952dee18d2ee2b2a5fe64c1986c5197177e198bd12a7318ab187dc45f44e31a23d81e870b058330748462cf7fec292bf94813cd12a5fa42d286
-DIST cyassl-2.2.0.zip 935384 SHA256 b2416bf2ec1b7c774d3c89e27577a0534cfe83a50f33d4af759021268bf20bb8 SHA512 71cb25c3bb69fec91898a5b701ec2b6787375cbb51f89cdce02413d084edb6c32a8d9091852f2f49b970b3e530c4ec437b27c83d8c511ef816b905eba097f5d3 WHIRLPOOL 2c135e674be17f5ad8859c9be4ed9ff9e3af562b4afb474ca192fc0387b1318b584e3afb844c82ac56fa8b0b0dd40ba61f357319c5a90d296341096e6b866d5f
-DIST cyassl-2.3.0.zip 975125 SHA256 b597f1c55d3bc4556d9c37e98ca56da2a529e111164d97c650fb097ef0a0d461 SHA512 8ad5ffa13344db1b4336e6bf693fb77eee1e7b13e961f2b5e8e07b9174e8fd3fad5bbe5005f0bfc329e3e213c50a928cd9c3f2aae404bfaddac0b0984aab6adb WHIRLPOOL 4a9d48df87a536892f067f394b5bfab2677a6788beeb23f81ad106a63414ef11a0fa40d0bdc35a2c443c8d744445072bf2be0827ba5f360efc90de201d2036cf
-DIST cyassl-2.4.0.zip 1027685 SHA256 5fcfccfac906d122e7d37b610d69a22e587e1a810670aa9eecc8f0cd02178d60 SHA512 a21f0d1b136590586b81c2b735e8ee37a456c8d472d3fd1f5a3b7d1582f31f270cfba0cf8d706eebe45a471dfb7c2201c4c7dcd01598b1fc57b2315632590583 WHIRLPOOL d6b8846e216b983113f4a2ef844c729bb1487f00279780193fc701ca510557946d812ebcbed397a6a579c29d0bd3ca8f694cb8dfa56e3d0f83600adcc8cda242
DIST cyassl-2.4.6.zip 1041965 SHA256 051caa5013cecafbec3780d2597374870e7e5a7bbeaeb502bc029d5774d6e508 SHA512 85d4db5207e3f47db676415f4d51ccbedbf3e1d05db19e91fd33d9ef80851d79933d40b1fed17acef3be803b811514b08065588889f9d6dec7fc63dfb58e4aff WHIRLPOOL b1a6edfdfc0bed8c95c8987fc35ad4dec772a17c66c5478cbae30e384a5a6857cca87dcbb8ac5e647e8fdbe4ea54827ccf88b04b276877896645617a05ef85ad
+DIST cyassl-2.5.0.zip 1203748 SHA256 3b4ecc75cdb001d5171b127c03fd3f458bc585bfa1c19505dcf36bc239c04c2e SHA512 0bacefc6ddb1c37ad2091352b92c9a49c2e592c0d01d2d8868529ebebc61d70112827ca19ba44571b150eb5723b2a745c74158aa403dc77c00c8f4a0d2de58b7 WHIRLPOOL 2af4e9440aab89197e2290c4ec4f75098a9284f74871a3817748f59ddaef7605559ca2791b4a5446dfcf0040d6891223cb97a9b29593f2e75f80737a69603d87
diff --git a/net-libs/cyassl/cyassl-2.0.8-r1.ebuild b/net-libs/cyassl/cyassl-2.0.8-r1.ebuild
deleted file mode 100644
index 62cde5dd87a9..000000000000
--- a/net-libs/cyassl/cyassl-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.0.8-r1.ebuild,v 1.6 2012/07/17 11:03:59 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-ni +hc128 +psk +ripemd sha512"
-CERT_OPTS="+sessioncerts +testcert"
-IUSE="-dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-disable-testsuit-ifnothreads.patch
-
- #Apply unconditionally, but only triggered if USE="aes-ni"
- epatch "${FILESDIR}"/${P}-fix-gnustack.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singleThreaded )
- else
- myconf+=( --enable-singleThreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #There are lots of options, so we'll force a few reasonable
- #We may change this in the future, in particular ecc needs to be fixed
- econf \
- --enable-opensslExtra \
- --enable-fortress \
- --enable-keygen \
- --enable-certgen \
- --disable-debug \
- --disable-ecc \
- --disable-small \
- --disable-ntru \
- --disable-noFilesystem \
- --disable-noInline \
- --disable-gcc-lots-o-warnings \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- $(use_enable aes-ni aesni) \
- $(use_enable hc128) \
- $(use_enable psk) \
- $(use_enable ripemd) \
- $(use_enable sha512) \
- $(use_enable dtls) \
- $(use_enable ipv6) \
- $(use_enable httpd webServer) \
- $(use_enable sessioncerts) \
- $(use_enable sniffer) \
- $(use_enable testcert) \
- $(use_enable static-libs static) \
- $(use_enable cyassl-hardening gcc-hardening) \
- $(use_enable cyassl-hardening linker-hardening) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.2.0.ebuild b/net-libs/cyassl/cyassl-2.2.0.ebuild
deleted file mode 100644
index d5d8baf46a96..000000000000
--- a/net-libs/cyassl/cyassl-2.2.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.2.0.ebuild,v 1.13 2012/09/06 10:27:49 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-ni +hc128 +psk +ripemd sha512"
-CERT_OPTS="ocsp crl +sessioncerts +testcert"
-IUSE="-dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-
- #Apply unconditionally, but only triggered if USE="aes-ni"
- epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singleThreaded )
- else
- myconf+=( --enable-singleThreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #There are lots of options, so we'll force a few reasonable
- #We may change this in the future, in particular ecc needs to be fixed
- econf \
- --enable-opensslExtra \
- --enable-fortress \
- --enable-keygen \
- --enable-certgen \
- --disable-debug \
- --disable-ecc \
- --disable-small \
- --disable-ntru \
- --disable-noFilesystem \
- --disable-noInline \
- --disable-gcc-lots-o-warnings \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- $(use_enable aes-ni aesni) \
- $(use_enable hc128) \
- $(use_enable psk) \
- $(use_enable ripemd) \
- $(use_enable sha512) \
- $(use_enable dtls) \
- $(use_enable ipv6) \
- $(use_enable httpd webServer) \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable sessioncerts) \
- $(use_enable sniffer) \
- $(use_enable testcert) \
- $(use_enable static-libs static) \
- $(use_enable cyassl-hardening gcc-hardening) \
- $(use_enable cyassl-hardening linker-hardening) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.4.0.ebuild b/net-libs/cyassl/cyassl-2.4.0.ebuild
deleted file mode 100644
index a2bf9d520ab1..000000000000
--- a/net-libs/cyassl/cyassl-2.4.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.4.0.ebuild,v 1.1 2012/10/18 21:34:31 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512"
-CERT_OPTS="ocsp crl crl-monitor +sessioncerts +testcert"
-IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-
- #Apply unconditionally, but only triggered if USE="aes-ni"
- epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.patch
-
- # https://sourceforge.net/tracker/?func=detail&atid=714511&aid=3576451&group_id=129181
- epatch "${FILESDIR}"/${P}-fix-missing-DYNAMIC_TYPE_LIBZ.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singleThreaded )
- else
- myconf+=( --enable-singleThreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #There are lots of options, so we'll force a few reasonable
- #We may change this in the future, in particular ecc needs to be fixed
- econf \
- --enable-opensslExtra \
- --enable-fortress \
- --enable-keygen \
- --enable-certgen \
- --disable-debug \
- --disable-ecc \
- --disable-small \
- --disable-ntru \
- --disable-noFilesystem \
- --disable-noInline \
- $(use_enable debug) \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ni aesni) \
- $(use_enable hc128) \
- $(use_enable md2) \
- $(use_enable psk) \
- $(use_enable ripemd) \
- $(use_enable sha512) \
- $(use_enable dtls) \
- $(use_enable ipv6) \
- $(use_enable httpd webServer) \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable sessioncerts) \
- $(use_enable sniffer) \
- $(use_enable testcert) \
- $(use_enable static-libs static) \
- $(use_enable cyassl-hardening gcc-hardening) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.3.0.ebuild b/net-libs/cyassl/cyassl-2.5.0.ebuild
similarity index 84%
rename from net-libs/cyassl/cyassl-2.3.0.ebuild
rename to net-libs/cyassl/cyassl-2.5.0.ebuild
index 032c5903767c..f32b3cca0df6 100644
--- a/net-libs/cyassl/cyassl-2.3.0.ebuild
+++ b/net-libs/cyassl/cyassl-2.5.0.ebuild
@@ -1,10 +1,12 @@
-# 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-libs/cyassl/cyassl-2.3.0.ebuild,v 1.2 2012/09/02 13:30:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.5.0.ebuild,v 1.2 2013/02/06 03:16:53 blueness Exp $
-EAPI="4"
+EAPI="5"
-inherit eutils
+WANT_AUTOMAKE=1.12
+
+inherit autotools eutils
DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
@@ -16,9 +18,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
#Add CRYPTO_OPTS=ecc when fixed
CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512"
+CRYPTO_OPTS="aes-gcm aes-ccm aes-ni camellia +hc128 md2 +psk +ripemd sha512"
CERT_OPTS="ocsp crl crl-monitor +sessioncerts +testcert"
-IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
+IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} test"
#You can only pick one cach size
#sha512 is broken on x86
@@ -34,8 +36,9 @@ RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
- #Apply unconditionally, but only triggered if USE="aes-ni"
- epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.patch
+ #Bug #454300
+ epatch "${FILESDIR}"/${PN}-2.4.6-respect-CFLAGS.patch
+ eautoreconf
}
src_configure() {
@@ -57,23 +60,24 @@ src_configure() {
#There are lots of options, so we'll force a few reasonable
#We may change this in the future, in particular ecc needs to be fixed
econf \
+ --disable-silent-rules \
--enable-opensslExtra \
--enable-fortress \
--enable-keygen \
--enable-certgen \
--disable-debug \
--disable-ecc \
- --disable-small \
--disable-ntru \
--disable-noFilesystem \
--disable-noInline \
- --disable-gcc-lots-o-warnings \
$(use_enable debug) \
$(use_enable small smallcache) \
$(use_enable big bigcache) \
$(use_enable huge hugecache) \
$(use_enable aes-gcm aesgcm) \
+ $(use_enable aes-ccm aesccm) \
$(use_enable aes-ni aesni) \
+ $(use_enable camellia) \
$(use_enable hc128) \
$(use_enable md2) \
$(use_enable psk) \
@@ -90,7 +94,6 @@ src_configure() {
$(use_enable testcert) \
$(use_enable static-libs static) \
$(use_enable cyassl-hardening gcc-hardening) \
- $(use_enable cyassl-hardening linker-hardening) \
$(use_with zlib libz) \
"${myconf[@]}"
}
diff --git a/net-libs/cyassl/files/cyassl-2.4.0-fix-missing-DYNAMIC_TYPE_LIBZ.patch b/net-libs/cyassl/files/cyassl-2.4.0-fix-missing-DYNAMIC_TYPE_LIBZ.patch
deleted file mode 100644
index dfa8903d95d4..000000000000
--- a/net-libs/cyassl/files/cyassl-2.4.0-fix-missing-DYNAMIC_TYPE_LIBZ.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes build error with missing DYNAMIC_TYPE_LIBZ
-
-Bug: https://sourceforge.net/tracker/?func=detail&atid=714511&aid=3576451&group_id=129181
-Patch: git://github.com/cyassl/cyassl.git
-Commit: ef47f1a25eab16e5d59fc4118c7b704eb5c07711
-
---
-diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
-index cfe2fea..3c171ec 100644
---- a/cyassl/ctaocrypt/types.h
-+++ b/cyassl/ctaocrypt/types.h
-@@ -221,7 +221,8 @@ enum {
- DYNAMIC_TYPE_RNG = 32,
- DYNAMIC_TYPE_ARRAYS = 33,
- DYNAMIC_TYPE_DTLS_POOL = 34,
-- DYNAMIC_TYPE_SOCKADDR = 35
-+ DYNAMIC_TYPE_SOCKADDR = 35,
-+ DYNAMIC_TYPE_LIBZ = 36
- };
-
- /* stack protection */
diff --git a/net-libs/cyassl/metadata.xml b/net-libs/cyassl/metadata.xml
index b51be1854f2f..935a6dbcfcc7 100644
--- a/net-libs/cyassl/metadata.xml
+++ b/net-libs/cyassl/metadata.xml
@@ -7,7 +7,9 @@
Enable AES Galois/Counter mode
+ Eanble AES Counter with CBC-MAC mode
Enable Intel AES instruction support
+ Enable Camellia-CBC cipher support
diff --git a/net-libs/libmapi/Manifest b/net-libs/libmapi/Manifest
index 0f89c87c4820..44ceaf06a730 100644
--- a/net-libs/libmapi/Manifest
+++ b/net-libs/libmapi/Manifest
@@ -1,2 +1 @@
-DIST openchange-0.9-COCHRANE.tar.gz 1601358 SHA256 b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402 SHA512 400adf60247a6766020d554ec20a159d79cc4a50991e018078fea1cc2b9910a5bf43f65872af111b6b6d4ee7c7525399623dc7e55c226e4baf421eb3eb0cd1fe WHIRLPOOL 4975c2418a1499d85115da5ce1473f4c51d2b97a420e787a0d4cc353df4ebc5d5566fda12793effa6276c76c53799d3c22cc36ebdf69e17c1c43a09516ff7c2c
DIST openchange-1.0-BORG.tar.gz 1979219 SHA256 f18c1fdb0dec10ea6a469cb7be5fc24010a44d8c5de42a23da5b0c864f343bb4 SHA512 20c3923bcbbbb09aeebe686727f0fd1d6d5e0d23e815e4c1c945077dd34b646bc80a64f103c830f95e2b26111685400c050717c5bed21ab79167fc913f88a54e WHIRLPOOL 92ffe9e36a0c8c60768d6a5a79b2ac6295f3cacedb245188103254105bcb93526d920739196b2d8738d38e81afe52acfa7096d2abf716b14ab785326a045436d
diff --git a/net-libs/libmapi/libmapi-0.9.ebuild b/net-libs/libmapi/libmapi-0.9.ebuild
deleted file mode 100644
index 2561a0005d93..000000000000
--- a/net-libs/libmapi/libmapi-0.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmapi/libmapi-0.9.ebuild,v 1.1 2010/02/23 12:31:58 dagger Exp $
-
-EAPI="2"
-
-MY_PN=openchange
-MY_P=${MY_PN}-${PV}-COCHRANE
-
-DESCRIPTION="Portable open-source implementations of Exchange protocols."
-HOMEPAGE="http://www.openchange.org/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="python"
-
-RDEPEND=">=net-fs/samba-4.0.0_alpha11
- dev-lang/python"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- ECONF="--disable-coverage
- --disable-swig-perl
- $(use_enable python pymapi)"
-
- econf ${ECONF}
-}
-
-src_compile() {
- emake libmapi || die "libmapi compilation failed"
- if use python ; then
- emake pymapi || die "pymapi compilation failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" libmapi-install || die "libmapi install failed"
- emake DESTDIR="${D}" libmapixx-install || die "libmapicxx install failed"
-
- if use python ; then
- emake DESTDIR="${D}" pymapi-install || die "pymapi install failed"
- fi
-}
diff --git a/net-libs/libmapi/metadata.xml b/net-libs/libmapi/metadata.xml
index 16e26c9b7af0..91f4e72fb544 100644
--- a/net-libs/libmapi/metadata.xml
+++ b/net-libs/libmapi/metadata.xml
@@ -2,7 +2,6 @@
- dagger@gentoo.org
- Robert Piasek
+ maintainer-needed@gentoo.org
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index ab082425b52a..5ce0c3133074 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,3 +1,4 @@
DIST libmicrohttpd-0.9.21.tar.gz 832996 SHA256 280d7e4a9ab9220db297b1e132acc8c0297ad95cf22a8b995fd8cb73562f3825 SHA512 b8d2919c140aa86353fb439d01d49f5d01fcf9070011f50f4e53b605ed18914a102133c64840fc998c1526200d632a255e6178bdd0a1f6993da47cca984fcfcb WHIRLPOOL 428bfe8e49df9ebea10375f8cbab1b073c97d069499de6801720b809485f234f86191fb2e92528d0081eebfb1a63a038bf998c07dc92d482a00c6024e065f579
DIST libmicrohttpd-0.9.23.tar.gz 779432 SHA256 0dfc98947d10b3a6c17d231eb36234698de8ccb20e4758370d86013ec05dabb0 SHA512 f5027215b6be773d3bc0768d1b08063db1d2b04aa7da1eed479402a358befce1ed28a4219346f463668a3d19cce742e6e7dee2825e23ed2ded60c69ce18487af WHIRLPOOL dd8608c448f5f5492f6eee99e51f1ba82284fc2fc44e7b918ada887d376dab8831dcf704d6eaf7becc13df47d578f85c43fc227cb3e45f3ed60f7effeace7554
DIST libmicrohttpd-0.9.24.tar.gz 801347 SHA256 d04cf7796e0b9e2845432d266712992840937e5975ed45f51f89ccc50d53e232 SHA512 d0c9efcf2d0902c87b332125d16481758f40c40d406802193b45c06278caf633528839b9456628f825614e17be184b89af564b87cd227573fd1a0b177e8a3901 WHIRLPOOL e97a5209c53b6ce7be98bd9cdcef85680db536eefe736f494d8b956a5dc344194bf2557232706700ac033f45ee797b24b346d4585e7160e2ee22a3824e7e356a
+DIST libmicrohttpd-0.9.25.tar.gz 802090 SHA256 64e4971302631de690acefa74bdd269917ea7e6d260576373d65d75bd4fa005d SHA512 92ff56229f551889926a899e0596c988dae808eee59267233edad4b29e70e62f8d02a37eeff9286b295356b77c747673dc8fd3cded2fa3220dd0ea3da88bddc9 WHIRLPOOL c696b35daa91a00127c7705af0abcd4a5f37f20653556ac4652f18a6a09eff4e01d79926fc4f2de0044e756ae9cd6239206a49b5904f606756cd4d930b254fa4
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.25.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.25.ebuild
new file mode 100644
index 000000000000..98fa2aaf5f7a
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.25.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.25.ebuild,v 1.1 2013/02/06 01:20:08 blueness Exp $
+
+EAPI="4"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application."
+HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+IUSE="messages ssl static-libs test"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="ssl? (
+ dev-libs/libgcrypt
+ net-libs/gnutls
+ )"
+
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+ econf \
+ --enable-bauth \
+ --enable-dauth \
+ $(use_enable test curl) \
+ $(use_enable messages) \
+ $(use_enable messages postprocessor) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 8339a69b5860..6fff193af4bc 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,2 +1,3 @@
DIST dhcpcd-5.6.4.tar.bz2 85671 SHA256 4072999704585c16ac45458d459eb50186c3de91c3c14c3288896963cc30b594 SHA512 eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2 WHIRLPOOL f8fba52a6f6d4e1822175069f6a636e83b09a1532bd258a4ec9b610e9eb196d35f1cfa0e855521f5d37edb840fb2dd4d46bffc8bf86ded0b205367711f4484ff
DIST dhcpcd-5.6.6.tar.bz2 85958 SHA256 dada838c4494864a901525dce9a0d204d94d830d9b7e4173b75692ce71c97e41 SHA512 55e5d8a818c421118c62fcea1cb259f15c8bafbb79f5d9b9d14c4099474fe25489189caa1025f2e07cd3a7446a794b4c757d9a28bea2c3e9bc1bc588d3d5e8dd WHIRLPOOL 0d2772216fbc964b0dc815c9e9a84eb5ca74bd690fc98b1eea0e1792a6e217311fcf407ff293a381c3875ad88a46eaaf446dcabf1d5e110ae9d2f5b5890155f4
+DIST dhcpcd-5.6.7.tar.bz2 85983 SHA256 102cc37596216c0e2c0b230fe58bf880e993ec8663c7c2178fb2a06c25938c90 SHA512 6fdb3716c2e09208e9813642ab275f26f2a2fd96065531408e8ce33179398405c35f7d91c0f10cef71a2ece8b5179c6dcf9887eb6e59e2599be46ea338dc1023 WHIRLPOOL 8b5fb218b0f67777b4b1e0b2b71bfc9b0eb3bfcb1e3646891d481b39d907aef7fd9a867aa79d301699de8618af32fb7329c179bc96db1004af84ac444a80dd3e
diff --git a/net-misc/dhcpcd/dhcpcd-5.6.7.ebuild b/net-misc/dhcpcd/dhcpcd-5.6.7.ebuild
new file mode 100644
index 000000000000..2a2faf4cba08
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.6.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.7.ebuild,v 1.1 2013/02/05 18:54:35 williamh Exp $
+
+EAPI=4
+
+inherit eutils systemd
+
+MY_P="${P/_alpha/-alpha}"
+MY_P="${MY_P/_beta/-beta}"
+MY_P="${MY_P/_rc/-rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+SLOT="0"
+IUSE="+zeroconf elibc_glibc"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ epatch_user
+ if ! use zeroconf; then
+ elog "Disabling zeroconf support"
+ {
+ echo
+ echo "# dhcpcd ebuild requested no zeroconf"
+ echo "noipv4ll"
+ } >> dhcpcd.conf
+ fi
+}
+
+src_configure() {
+ local hooks="--with-hook=ntp.conf"
+ use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+ econf \
+ --prefix="${EPREFIX}" \
+ --libexecdir="${EPREFIX}/lib/dhcpcd" \
+ --dbdir="${EPREFIX}/var/lib/dhcpcd" \
+ --localstatedir="${EPREFIX}/var" \
+ ${hooks}
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+ has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
+}
+
+pkg_postinst() {
+ # Upgrade the duid file to the new format if needed
+ local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+ local new_duid="${ROOT}"/etc/dhcpcd.duid
+ if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+ sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+ fi
+
+ # Move the duid to /etc, a more sensible location
+ if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+ cp -p "${old_duid}" "${new_duid}"
+ fi
+
+ if use zeroconf && ! $prev_zero; then
+ elog "You have installed dhcpcd with zeroconf support."
+ elog "This means that it will always obtain an IP address even if no"
+ elog "DHCP server can be contacted, which will break any existing"
+ elog "failover support you may have configured in your net configuration."
+ elog "This behaviour can be controlled with the -L flag."
+ elog "See the dhcpcd man page for more details."
+ fi
+
+ # Mea culpa, feel free to remove that after some time --mgorny.
+ if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]]
+ then
+ ebegin "Moving ${PN}.service to multi-user.target"
+ mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \
+ "${ROOT}"/etc/systemd/system/multi-user.target.wants/
+ eend ${?} \
+ "Please try to re-enable dhcpcd.service"
+ fi
+}
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
index 8c5e2c8a25ba..9beeb5817b87 100644
--- a/net-misc/ipx-utils/Manifest
+++ b/net-misc/ipx-utils/Manifest
@@ -1 +1 @@
-DIST ipx-1.1.tar.gz 8177 SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8
+DIST ipx-1.1.tar.gz 8177 SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8 SHA512 cb1bcf0c28939ab5ff1e1cf36f1cb8cbfcb7c019d65df5fc56a1b43673406cdf4abffa3d6164615e42ce955f078c05f721da90ca54353870e552c01bb3c2973d WHIRLPOOL 829715dd9e0b3d1cf7ee5443fe3081bf2534b4f5e85ea096f0cf722d94e068c53141a3504ac9dc51457747d4038e249bd187dced1d07cb867fd106575ae07d65
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
index 09114c1cda1f..47dcb46940cc 100644
--- a/net-misc/ipx-utils/files/ipx.init
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.4 2004/07/15 00:00:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.5 2013/02/05 18:17:09 ulm Exp $
#NB: Config is in /etc/conf.d/ipx
@@ -34,6 +34,7 @@ stop() {
local retval=0
ebegin "Bringing IPX down"
+ /bin/umount -v -a -tncpfs
/sbin/ipx_configure --auto_primary=off --auto_interface=off
retval=$?
/sbin/ipx_interface delall
diff --git a/net-misc/ipx-utils/files/ipx.init-r1 b/net-misc/ipx-utils/files/ipx.init-r1
deleted file mode 100644
index 7285b4bfd04c..000000000000
--- a/net-misc/ipx-utils/files/ipx.init-r1
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init-r1,v 1.1 2012/02/11 14:32:31 pacho Exp $
-
-#NB: Config is in /etc/conf.d/ipx
-
-depend() {
- use net
-}
-
-start() {
- local retval=0
-
- ebegin "Bringing IPX up"
- if [ ${IPX_INTERNAL_NET} = "yes" ]
- then
- /sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
- retval=$?
- else
- /sbin/ipx_interface add -p ${IPX_DEVICE} \
- ${IPX_FRAME} ${IPX_NETNUM}
- retval=$?
- fi
-
- ipx_configure \
- --auto_primary=${IPX_AUTO_PRIMARY} \
- --auto_interface=${IPX_AUTO_INTERFACE}
- retval=$(( $retval + $? ))
- eend ${retval} "Failed to bring IPX up"
-}
-
-stop() {
- local retval=0
-
- ebegin "Bringing IPX down"
- /bin/umount -v -a -tncpfs
- /sbin/ipx_configure --auto_primary=off --auto_interface=off
- retval=$?
- /sbin/ipx_interface delall
- retval=$(( $retval + $? ))
- eend ${retval} "Failed to down IPX"
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
deleted file mode 100644
index 85958121d6a7..000000000000
--- a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.6 2012/07/29 17:19:50 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="The IPX Utilities"
-HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
-
-LICENSE="Caldera GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${P/-utils}
-
-src_unpack() {
- unpack ${A}
-
- sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${P}-proc.patch #67642
-}
-
-src_install() {
- dodir /sbin /usr/share/man/man8
- dodoc "${S}"/README
- make DESTDIR="${D}" install || die "make install failed!"
-
- newconfd "${FILESDIR}"/ipx.confd ipx
- newinitd "${FILESDIR}"/ipx.init ipx
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild
index 3237902b878a..4d14af4a019f 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r3.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/ipx-utils/ipx-utils-1.1-r3.ebuild,v 1.6 2012/07/29 17:19:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild,v 1.7 2013/02/05 18:17:09 ulm Exp $
EAPI="4"
inherit eutils
@@ -9,7 +9,7 @@ DESCRIPTION="The IPX Utilities"
HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
-LICENSE="Caldera GPL-2"
+LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
IUSE=""
@@ -30,5 +30,5 @@ src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/ipx.confd ipx
- newinitd "${FILESDIR}"/ipx.init-r1 ipx
+ newinitd "${FILESDIR}"/ipx.init ipx
}
diff --git a/net-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
index 966cc90bb07e..68cf6ecb8e56 100644
--- a/net-misc/ofono/metadata.xml
+++ b/net-misc/ofono/metadata.xml
@@ -2,8 +2,7 @@
- dagger@gentoo.org
- Robert Piasek
+ maintainer-needed@gentoo.org
ETSI AT modem support.
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 021cddf3ff9f..24eec51356d7 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,4 +1,5 @@
DIST tor-0.2.3.25.tar.gz 3190011 SHA256 bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0 SHA512 c15f9356abc41bd1c663d37e674386debc29b0a5887e1120a0318ffb97ada1a04d57756175f01f13549f179f73916e2af18566575a656154ff71ec050fc99651 WHIRLPOOL 6660f5db69bf89cba17937fc72982f674d70fd64c31647228b15d5f19febcd9e64bf09d94e1681f8a0285f2129dbfe3e77687e4d44f335ca8013e318023f755b
+DIST tor-0.2.4.10-alpha.tar.gz 2908076 SHA256 2f4122f7dc88ccd319a4677e46ae57e3ac157fd1da45d77e4e4d53f9e81953eb SHA512 eb59e48bdd267a3e8d47cf812cd1c3ba1d3b35fc07a1e2cf3d991982550da5064c7e66e9d511594c1177087ade5feb7893bf08504fafb41a2315102bab6e1383 WHIRLPOOL 3b3e9563da0edfdf8a7bbbed2fed227d11a8d680df00fc1a38a09887a5e32197131cc4dc9b17dfcddb8c7240aa127deea82be96c5482383df11133cdcb2ef8b5
DIST tor-0.2.4.6-alpha.tar.gz 3208046 SHA256 2b7b3c9d1568dec9213965ab15d83702411efcbe9143e37e571a766cea670012 SHA512 bd62e486f12c529f9984efa1010e14bba0008eef16ab3449918a7eee949567ee01254479f98d2cdcf890f871011aa5c09d70f9b7a10da3b8da41185d74fadf8d WHIRLPOOL 3c83f06e5e0a0be7c80279b1755aee828513fe101d53adf39e8714b011782a93212d12593fe6365b388a41fcd6f2d5608d89c7473e9b128dc0d4d29b3bbbff6a
DIST tor-0.2.4.7-alpha.tar.gz 2873803 SHA256 0e14c1816c9747b97fd51eb7de5e30739d66da582015f4376f614243411b4073 SHA512 3b28d39abe006ad974cd9521949e35cb20ecb4459c32f832537754f83269015dae656ea29d501e2b5592668b773d3936718a4c36ab3d17e8e7b329c9ef05fa15 WHIRLPOOL 70ccf9a08ac17583216122602c3310a23f2f97463054102f525168e86aaa9b14c9b5fcb92750d6f3dd878c003462a9dc69f853c1753ad51e77c75e8a7cbdf79e
DIST tor-0.2.4.9-alpha.tar.gz 2895169 SHA256 6a0a0069faea0c58187381b7f603bb31a44bb8d4e0341385e225d03b6a32c463 SHA512 6913587f4c9efc3794a5e06abc5e3005e432b66e2be1d2dae81870630df28a5513b5003c316be06efd2ed9d5434d8485ac19ff95fe43faffa927476df3c9c9ea WHIRLPOOL 6bcbd6c9b5a137c5aa4f27ebb48394b4c98d2e303de7f454a64f31c52cdf38673ae37bf8173b1154823a9c0fa2f9e9122bac94b5d7ca8058f6fa3ee3a0b141d5
diff --git a/net-misc/tor/tor-0.2.4.10_alpha.ebuild b/net-misc/tor/tor-0.2.4.10_alpha.ebuild
new file mode 100644
index 000000000000..66e546c3a4ce
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.10_alpha.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.10_alpha.ebuild,v 1.1 2013/02/05 15:41:13 blueness Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bufferevents nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
+
+DEPEND="dev-libs/openssl
+ sys-libs/zlib
+ dev-libs/libevent
+ nat-pmp? ( net-libs/libnatpmp )
+ upnp? ( net-libs/miniupnpc )
+ selinux? ( sec-policy/selinux-tor )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+}
+
+src_configure() {
+ # Upstream isn't sure of all the user provided CFLAGS that
+ # will break tor, but does recommend against -fstrict-aliasing.
+ # We'll filter-flags them here as we encounter them.
+ filter-flags -fstrict-aliasing
+ econf \
+ --disable-buf-freelists \
+ --enable-asciidoc \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable stats instrument-downloads) \
+ $(use_enable bufferevents) \
+ $(use_enable nat-pmp) \
+ $(use_enable tor-hardening gcc-hardening) \
+ $(use_enable tor-hardening linker-hardening) \
+ $(use_enable transparent-proxy transparent) \
+ $(use_enable threads) \
+ $(use_enable upnp) \
+ $(use_enable web tor2web-mode)
+}
+
+src_install() {
+ newconfd "${FILESDIR}"/tor.confd tor
+ newinitd "${FILESDIR}"/tor.initd-r6 tor
+
+ emake DESTDIR="${D}" install
+
+ keepdir /var/lib/tor
+
+ dodoc README ChangeLog ReleaseNotes \
+ doc/{HACKING,spec/README}
+
+ fperms 750 /var/lib/tor
+ fowners tor:tor /var/lib/tor
+
+ insinto /etc/tor/
+ newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+ elog
+ elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+ elog "change it according to your needs. Use the torrc.sample that is in"
+ elog "that directory as a guide. Also, to have privoxy work with tor"
+ elog "just add the following line"
+ elog
+ elog "forward-socks4a / localhost:9050 ."
+ elog
+ elog "to /etc/privoxy/config. Notice the . at the end!"
+ elog
+}
diff --git a/profiles/license_groups b/profiles/license_groups
index ff5137346975..4b692f6addd8 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.183 2013/02/03 22:03:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.184 2013/02/05 18:08:22 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy
# separation?
# BSD-4 alikes: dom4j FastCGI icu JDOM
-MISC-FREE Allegro alternate ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE keynote LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof mapm-4.9.5 matplotlib md2k7-asyouwish MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a OpenSoftware Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils pysqlite qmail-nelson rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
+MISC-FREE Allegro alternate ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof mapm-4.9.5 matplotlib md2k7-asyouwish minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a OpenSoftware Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils pysqlite qmail-nelson rc regexp-UofT RSA Scintilla Sendmail shrimp skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules tm-align w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.
diff --git a/profiles/package.mask b/profiles/package.mask
index 225d2761113e..d796aff5ff08 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14431 2013/02/04 19:56:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14435 2013/02/06 01:06:54 floppym Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,12 @@
#--- END OF EXAMPLES ---
+# Diego Elio Pettenò (5 Feb 2013)
+# Needs a complete ebuild rewrite to use CMake, and a new patchset to
+# unbundle the bundled libraries. Use at your own risk; don't ask for
+# a bump unless you can provide the two needed items.
+media-gfx/blender
+
# Michael Sterrett (31 Jan 2013)
# Old, dead upstream and require guile[deprecated]
# Masked for removal on 20130302
@@ -644,7 +650,6 @@ sys-apps/systemd-sysv-utils
# Jeroen Roovers (27 Mar 2012)
# Opera Next and Opera snapshots are unsupported and eternally unstable.
#
-=www-client/opera-12.14*
www-client/opera-next
# Ulrich Mueller (13 Dec 2011)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dd5d9b7b6b4c..1331db415045 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4155,9 +4155,11 @@ net-libs/c-client:doc - Install RFCs related to IMAP
net-libs/c-client:topal - Enable support for net-mail/topal for use with mail-client/alpine
net-libs/courier-authlib:vpopmail - Enable vpopmail support
net-libs/cvm:vpopmail - Enable vpopmail support
+net-libs/cyassl:aes-ccm - Eanble AES Counter with CBC-MAC mode
net-libs/cyassl:aes-gcm - Enable AES Galois/Counter mode
net-libs/cyassl:aes-ni - Enable Intel AES instruction support
net-libs/cyassl:big - Choose big cache size (excludes small or huge)
+net-libs/cyassl:camellia - Enable Camellia-CBC cipher support
net-libs/cyassl:crl - Enable Certificate Revocation List
net-libs/cyassl:crl-monitor - Enable Certificate Revocation List Directory Monitoring
net-libs/cyassl:cyassl-hardening - Add hardening flags to CFLAGS/LDFLAGS
diff --git a/sci-biology/shrimp/shrimp-2.0.1.ebuild b/sci-biology/shrimp/shrimp-2.0.1.ebuild
index f2780029be30..7aea341d3447 100644
--- a/sci-biology/shrimp/shrimp-2.0.1.ebuild
+++ b/sci-biology/shrimp/shrimp-2.0.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/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.7 2013/01/23 10:06:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.8 2013/02/05 18:26:59 ulm Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="SHort Read Mapping Package"
HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
-LICENSE="as-is"
+LICENSE="shrimp"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="custom-cflags"
diff --git a/sci-biology/shrimp/shrimp-2.1.0.ebuild b/sci-biology/shrimp/shrimp-2.1.0.ebuild
index 12ffde4a156d..757b7620c05f 100644
--- a/sci-biology/shrimp/shrimp-2.1.0.ebuild
+++ b/sci-biology/shrimp/shrimp-2.1.0.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/sci-biology/shrimp/shrimp-2.1.0.ebuild,v 1.3 2013/01/23 10:06:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.1.0.ebuild,v 1.4 2013/02/05 18:26:59 ulm Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="SHort Read Mapping Package"
HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
-LICENSE="as-is"
+LICENSE="shrimp"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags"
diff --git a/sci-biology/shrimp/shrimp-2.2.3.ebuild b/sci-biology/shrimp/shrimp-2.2.3.ebuild
index 1cf708f9c173..83873f6b0b4e 100644
--- a/sci-biology/shrimp/shrimp-2.2.3.ebuild
+++ b/sci-biology/shrimp/shrimp-2.2.3.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/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.2 2013/01/23 10:06:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.3 2013/02/05 18:26:59 ulm Exp $
EAPI=4
@@ -14,7 +14,7 @@ DESCRIPTION="SHort Read Mapping Package"
HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
-LICENSE="as-is"
+LICENSE="shrimp"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags"
diff --git a/sci-chemistry/tm-align/tm-align-20120124.ebuild b/sci-chemistry/tm-align/tm-align-20120124.ebuild
index abf7cbe84998..442d939d392e 100644
--- a/sci-chemistry/tm-align/tm-align-20120124.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20120124.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/sci-chemistry/tm-align/tm-align-20120124.ebuild,v 1.2 2012/08/13 20:06:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20120124.ebuild,v 1.3 2013/02/05 18:30:14 ulm Exp $
EAPI=4
@@ -10,8 +10,8 @@ DESCRIPTION="Quick & Accurate Structural Alignment"
HOMEPAGE="http://zhanglab.ccmb.med.umich.edu/TM-align/"
SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
+LICENSE="tm-align"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static custom-cflags"
diff --git a/sci-chemistry/tm-align/tm-align-20120707.ebuild b/sci-chemistry/tm-align/tm-align-20120707.ebuild
index 784225c9cd9f..f1c62cddd6c7 100644
--- a/sci-chemistry/tm-align/tm-align-20120707.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20120707.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/sci-chemistry/tm-align/tm-align-20120707.ebuild,v 1.2 2013/02/03 15:13:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20120707.ebuild,v 1.3 2013/02/05 18:30:14 ulm Exp $
EAPI=4
@@ -10,8 +10,8 @@ DESCRIPTION="Quick & Accurate Structural Alignment"
HOMEPAGE="http://zhanglab.ccmb.med.umich.edu/TM-align/"
SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
+LICENSE="tm-align"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="static custom-cflags"
diff --git a/sci-libs/buddy/buddy-2.2.ebuild b/sci-libs/buddy/buddy-2.2.ebuild
index 141d78443774..00cd1174e2fe 100644
--- a/sci-libs/buddy/buddy-2.2.ebuild
+++ b/sci-libs/buddy/buddy-2.2.ebuild
@@ -1,12 +1,12 @@
-# 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/sci-libs/buddy/buddy-2.2.ebuild,v 1.6 2012/10/18 21:31:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/buddy/buddy-2.2.ebuild,v 1.7 2013/02/05 18:33:04 ulm Exp $
DESCRIPTION="Binary Decision Diagram Package"
HOMEPAGE="http://www.itu.dk/research/buddy/"
SRC_URI="http://www.itu.dk/research/buddy/buddy22.tar.gz"
-LICENSE="as-is"
+LICENSE="buddy"
SLOT="0"
KEYWORDS="x86 ~ppc"
IUSE=""
diff --git a/sci-libs/buddy/buddy-2.4.ebuild b/sci-libs/buddy/buddy-2.4.ebuild
index 6310523ee3e1..1d008d692080 100644
--- a/sci-libs/buddy/buddy-2.4.ebuild
+++ b/sci-libs/buddy/buddy-2.4.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/sci-libs/buddy/buddy-2.4.ebuild,v 1.10 2012/10/18 21:31:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/buddy/buddy-2.4.ebuild,v 1.11 2013/02/05 18:33:04 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Binary Decision Diagram Package"
HOMEPAGE="http://sourceforge.net/projects/buddy/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="buddy"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc examples static-libs"
diff --git a/sci-libs/cminpack/cminpack-1.3.0.ebuild b/sci-libs/cminpack/cminpack-1.3.0.ebuild
index 0cdcc283dbbb..8260a5a6b7f8 100644
--- a/sci-libs/cminpack/cminpack-1.3.0.ebuild
+++ b/sci-libs/cminpack/cminpack-1.3.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/sci-libs/cminpack/cminpack-1.3.0.ebuild,v 1.2 2012/08/03 17:22:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.3.0.ebuild,v 1.3 2013/02/05 18:38:50 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-LICENSE="BSD"
+LICENSE="minpack"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
diff --git a/sci-libs/cmpfit/cmpfit-1.2.ebuild b/sci-libs/cmpfit/cmpfit-1.2.ebuild
index 4dc43b53b574..c216ee1128fa 100644
--- a/sci-libs/cmpfit/cmpfit-1.2.ebuild
+++ b/sci-libs/cmpfit/cmpfit-1.2.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/sci-libs/cmpfit/cmpfit-1.2.ebuild,v 1.1 2012/11/19 23:57:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cmpfit/cmpfit-1.2.ebuild,v 1.2 2013/02/05 18:35:16 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="MINPACK-1 Least Squares Fitting Library in C"
HOMEPAGE="http://www.physics.wisc.edu/~craigm/idl/cmpfit.html"
SRC_URI="http://www.physics.wisc.edu/~craigm/idl/down/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="public-domain minpack"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
diff --git a/sys-apps/kmod/kmod-12-r1.ebuild b/sys-apps/kmod/kmod-12-r1.ebuild
index 60ad576912df..8c900cc37d24 100644
--- a/sys-apps/kmod/kmod-12-r1.ebuild
+++ b/sys-apps/kmod/kmod-12-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.7 2013/01/27 13:53:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.8 2013/02/05 16:01:09 ssuominen Exp $
EAPI=4
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool multilib linux-info
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -37,6 +37,12 @@ DEPEND="${RDEPEND}
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )"
+pkg_setup() {
+ CONFIG_CHECK="~MODULES"
+
+ linux-info_pkg_setup
+}
+
src_prepare()
{
if [ ! -e configure ]; then
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 02fc672b6fab..a40320740014 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.46 2013/01/18 17:01:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.47 2013/02/05 16:01:09 ssuominen Exp $
EAPI=4
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool multilib linux-info
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -37,6 +37,12 @@ DEPEND="${RDEPEND}
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )"
+pkg_setup() {
+ CONFIG_CHECK="~MODULES"
+
+ linux-info_pkg_setup
+}
+
src_prepare()
{
if [ ! -e configure ]; then
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index fd6ff48fea4a..9201df1ca163 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1 +1,2 @@
DIST nawk-20110810.tar.gz 108035 SHA256 48af177922700c313aa9d22100d230d2d0280d56b8598d80f583d57b44bf63a8 SHA512 8f2d8e288b2bf6dca0067c87de38eb833c0fea0ef2ef75a3180e79c0a554bb00037985de389b85c23b875c6e64261182f782fd70f6a1c64f6015af997090d972 WHIRLPOOL 4fc4d1dd620f5df7334d04aa2bf624244e6166d745ee52d04ec235d4935a2d72be1251f8bdc7bc1707a5988c254b1ed46407098a1dbaf011c1bc56821a730727
+DIST nawk-20121220.tar.gz 88970 SHA256 8dc092165c5a4e1449f964286483d06d0dbfba4b0bd003cb5dab30de8f6d9b83 SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f WHIRLPOOL 6d8effe600eaf49c9bce79b027732909992f606ba89e771ad041f5ef3b32a44e7b0fa41576fdeb3e220f1e4859e2701397946fa90cb0ee4a334eb0178fabee91
diff --git a/sys-apps/nawk/nawk-20110810-r1.ebuild b/sys-apps/nawk/nawk-20110810-r1.ebuild
index 6074e692e5d5..8e5867154f87 100644
--- a/sys-apps/nawk/nawk-20110810-r1.ebuild
+++ b/sys-apps/nawk/nawk-20110810-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/sys-apps/nawk/nawk-20110810-r1.ebuild,v 1.3 2012/10/12 22:04:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20110810-r1.ebuild,v 1.4 2013/02/06 03:19:35 ottxor Exp $
EAPI="4"
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
-SRC_URI="http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo.org/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/sys-apps/nawk/nawk-20121220-r1.ebuild b/sys-apps/nawk/nawk-20121220-r1.ebuild
new file mode 100644
index 000000000000..4547c7aa522c
--- /dev/null
+++ b/sys-apps/nawk/nawk-20121220-r1.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/sys-apps/nawk/nawk-20121220-r1.ebuild,v 1.1 2013/02/06 03:29:55 ottxor Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
+HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
+SRC_URI="mirror://gentoo.org/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="app-admin/eselect-awk"
+DEPEND="${RDEPEND}
+ virtual/yacc"
+
+S="${WORKDIR}"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS=-DHAS_ISBLANK ALLOC="${LDFLAGS}" YACC=$(type -p yacc) YFLAGS="-d"
+}
+
+src_install() {
+ newbin a.out "${PN}"
+ sed -e 's/awk/nawk/g' \
+ -e 's/AWK/NAWK/g' \
+ -e 's/Awk/Nawk/g' \
+ awk.1 > "${PN}".1 || die "manpage patch failed"
+ doman "${PN}".1
+ dodoc README FIXES
+}
+
+pkg_postinst() {
+ eselect awk update ifunset
+}
+
+pkg_postrm() {
+ eselect awk update ifunset
+}
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 9b4a5c41475f..cce91512a3d5 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,9 +1 @@
-DIST paludis-0.66.0.tar.bz2 1680044 SHA256 c647a3fc4af1e8dfbcb99945070db7f33b8508bdfac578e3c3441abe3ce8aaf0 SHA512 e0190e4384a9cdfbef75e59275cfe846ee4e4681f43481ce763a9f099601e951dbdc28e9308b2f3886b94d5c49ef505a708a74877e8b0a161d050581fbdeab5e WHIRLPOOL 7ab231154d1ecfb7768e87b1bc26de11ca9636bb2c4d7240e611cddc5db56a69c2dc16da35cb0f8698e16acc38a9deb8b026d949be0315b1c8be7dee0d7ac84f
-DIST paludis-0.68.0.tar.bz2 1680854 SHA256 ab24460270c2dd9cba41e343ca245c135d9524c99f4d29e6e1beaff382f62c7f SHA512 aed8fa3d4de451565feb1d902b1736a4ec01939a3eb18a0af169ac8a3d7ebd0fcd97150ddb36c1b661152bd93f94b5e6981cb3216760764f9e2576ec854871ac WHIRLPOOL 1bb611dfce7e9b4d09a5018fd80a8bbc14870e27e60f0c108b6011155c745155b56d60f6546e12801e231df536632450da995c03ea3101b3d4d42b49205a9543
-DIST paludis-0.70.2.tar.bz2 1719246 SHA256 3d584cc7db681eb1774c508be3cc72a2395d55e19070bf092b89f0729b6ec28d SHA512 dc5dd557159cc826c928148b0e7b68ad02b903d818ed3866c789f0d3cfa65a7a86b369a20ab246ec947a21e01fe988c61d4fbfbb988d890fe312417a0de472fd WHIRLPOOL f974e8e3b3489c9deb75c66c4030116d6b8ef2b4a4dcb21a31649f148810490feff9f31318269ffcef0ed9ead2df4e438d7031c7c6c90f92aadef4068a4c5b7f
-DIST paludis-0.72.2.tar.bz2 1719035 SHA256 192f6bbf7a56b33af206e38cab08f723796abc7ba8735fc25e07c505be84769d SHA512 b3a16a2744a514d98279c19b1559dcbad2f41015faea984f449c6e360491fdfbf6b56f5616f3b24f2c51ab1bab91cfc36b411c8d521686d9edadf0f7f27524e0 WHIRLPOOL 0cdd3c8dcd1344e47f0d02a64252c86273cd25b597ac5cd470d2b4d4e81dbdccc7b8bdafb5256fedeb62d262b248a8f6cc4753d6929b25153c9b739f43328e0f
-DIST paludis-0.74.1.tar.bz2 1715477 SHA256 dc23446ea820c3e63cf81abd0ef1b26a3c2600e9c6a101bb1dbe56852b481bbb SHA512 8499efff22998d6f58e5f42c38687a837e9d25f139e6d5a08811a9bb57d9febee557eb29f18aa0a1a5778eab2786afb89941acdc96d00cbad4fee828af6fa887 WHIRLPOOL 42e52087aaa06613a3b947d33ccddc361527973ac193b9dafaf36fda17cf46bbd0d468978c61af477604ad59b0351536c8f59adeeca012cafdff9ee2aefdb356
-DIST paludis-0.76.0.tar.bz2 1721634 SHA256 371fa4835d38631bc444572cc1e7030b91d620ae696f9a7bd9b890072c15f34e SHA512 285927d5cc57d4a1b30e1c179172851bdd3458ed6aa1cae25a89a1c7fcb184de72a13e054b4add6d5cc79d4e8739a9e5322e54ab8a9daccdd6ae9a1ad836c486 WHIRLPOOL 752c8d2fe010a82c0ce0adafc797dd72fe567b4339b53ad150ecadc4525ec123e37e8c81b2d992015a75a68e0f560a9bb2c2af0061b697b011b613406d6a81ba
-DIST paludis-0.78.2.tar.bz2 1727298 SHA256 a8ba01a615ef8ba2ca5572f55fe30a3ab37a8de2fe0e2c6aa22e25bc36950962 SHA512 c991ef47dca48e9096069b78773f0decfdec18c69c4f1bf44ded7596dd28fe344ba88890ff2aa4e8aaa22320acd05b0095f22b347382ae6892cceb240a6666fc WHIRLPOOL da3266e3aec8929c677dc0ed803efb6cd7a675f64f7ca1229cde98f18b94e997ea37b5e2ac7c784f53fa030d2f7232479bee0c7f7e297ec15eff0ff61d03b345
-DIST paludis-0.80.2.tar.bz2 1743296 SHA256 c9c3acd30b462c5b42f7b0b200cf4a251735151182b6c343b060f19c5005b49a SHA512 b108bb5c3dba6d9cd5f32f63538749c2f142935ed7eac1e9834dd562efffb324971dcbb0c332b4adc9507a4504918865d1eb1d36b4032ad0097cf13e4db85833 WHIRLPOOL cfbc0e315a59181d09fa162e2223c01d3853cd0a4992df5a052e5b9aba04f971bba8995b6e3cdb387f537bd814cadb79fd57e8dc9260c07413a86467a25044ce
DIST paludis-0.82.0.tar.bz2 1742037 SHA256 eeeaf978a5d73476fea5c062c538d11d72e86bf89eee51ada1625a4bfe5443de SHA512 ee262df87e9bd5d5a74d4630f92fd37d1686bc8a144d262f44b7cf2e31160ea6cd888e3a205ba64052650fc67e3a68e1f9870cd082a245015084ae289a9c293b WHIRLPOOL 778ea19989461118d42084451642a5eea3952d67b6f92224557e87d89017746885cc9a1408ac4a85ed3f0f9d0ea674b7ba77b98116259177f6ea8ed27c9f3f25
diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index 3d17fe8d65e7..1738e027e4e6 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -2,8 +2,7 @@
- dagger@gentoo.org
- Robert Piasek
+ maintainer-needed@gentoo.org
Enable binary package support. Adds dependency upon
diff --git a/sys-apps/paludis/paludis-0.66.0.ebuild b/sys-apps/paludis/paludis-0.66.0.ebuild
deleted file mode 100644
index c1b19a92c474..000000000000
--- a/sys-apps/paludis/paludis-0.66.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.66.0.ebuild,v 1.3 2012/05/04 09:17:28 jdhore Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-2.8.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.68.0.ebuild b/sys-apps/paludis/paludis-0.68.0.ebuild
deleted file mode 100644
index b920769b6094..000000000000
--- a/sys-apps/paludis/paludis-0.68.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.68.0.ebuild,v 1.3 2012/05/04 09:17:28 jdhore Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-2.8.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.70.2.ebuild b/sys-apps/paludis/paludis-0.70.2.ebuild
deleted file mode 100644
index 5f004295732e..000000000000
--- a/sys-apps/paludis/paludis-0.70.2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.70.2.ebuild,v 1.2 2012/05/04 09:17:28 jdhore Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-2.8.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.72.2.ebuild b/sys-apps/paludis/paludis-0.72.2.ebuild
deleted file mode 100644
index 95155a3e9113..000000000000
--- a/sys-apps/paludis/paludis-0.72.2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.72.2.ebuild,v 1.2 2012/05/04 09:17:28 jdhore Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-2.8.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.74.1.ebuild b/sys-apps/paludis/paludis-0.74.1.ebuild
deleted file mode 100644
index c127fb7630d8..000000000000
--- a/sys-apps/paludis/paludis-0.74.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.74.1.ebuild,v 1.2 2012/05/04 09:17:28 jdhore Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-2.8.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.76.0.ebuild b/sys-apps/paludis/paludis-0.76.0.ebuild
deleted file mode 100644
index 507ae69d2bba..000000000000
--- a/sys-apps/paludis/paludis-0.76.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.76.0.ebuild,v 1.2 2012/06/27 11:29:34 dev-zero Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-3.0.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax )
- )
- virtual/pkgconfig
- dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.78.2.ebuild b/sys-apps/paludis/paludis-0.78.2.ebuild
deleted file mode 100644
index 4f8d281da7b2..000000000000
--- a/sys-apps/paludis/paludis-0.78.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.78.2.ebuild,v 1.1 2012/09/13 15:55:22 dev-zero Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index test vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-3.0.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax )
- )
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if use test &&
- ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- $(use_enable test gtest ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-apps/paludis/paludis-0.80.2.ebuild b/sys-apps/paludis/paludis-0.80.2.ebuild
deleted file mode 100644
index 4966cc525d62..000000000000
--- a/sys-apps/paludis/paludis-0.80.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.80.2.ebuild,v 1.1 2012/10/23 08:16:11 dev-zero Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index test vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-admin/eselect-1.2.13
- >=app-shells/bash-3.2
- >=sys-devel/gcc-4.4
- dev-libs/libpcre
- sys-apps/file
- pbins? ( >=app-arch/libarchive-3.0.4 )
- python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
- ruby-bindings? ( >=dev-lang/ruby-1.8 )
- xml? ( >=dev-libs/libxml2-2.6 )
- search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
- !prebuilt-documentation? (
- >=app-text/asciidoc-8.6.3
- app-text/xmlto
- )
- doc? (
- || ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
- media-gfx/imagemagick
- python-bindings? ( dev-python/epydoc dev-python/pygments )
- ruby-bindings? ( dev-ruby/syntax )
- )
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
- vim-syntax? ( >=app-editors/vim-core-7 )
- app-admin/eselect-package-manager"
-
-create-paludis-user() {
- enewgroup "paludisbuild"
- enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
- if ! built_with_use dev-libs/libpcre cxx ; then
- eerror "Paludis needs dev-libs/libpcre built with C++ support"
- eerror "Please build dev-libs/libpcre with USE=cxx support"
- die "Rebuild dev-libs/libpcre with USE=cxx"
- fi
-
- if use test &&
- ! built_with_use dev-cpp/gtest threads ; then
- eerror "Paludis needs dev-cpp/gtest built with threads support"
- eerror "Please build dev-cpp/gtest with USE=threads support"
- die "Rebuild dev-cpp/gtest with USE threads"
- fi
-
- if use python-bindings && \
- ! built_with_use --missing true dev-libs/boost python; then
- eerror "With USE python-bindings you need boost build with the python"
- eerror "use flag."
- die "Rebuild dev-libs/boost with USE python"
- fi
-
- if use pbins && \
- built_with_use app-arch/libarchive xattr; then
- eerror "With USE pbins you need libarchive build without the xattr"
- eerror "use flag."
- die "Rebuild app-arch/libarchive without USE xattr"
- fi
-
- if id paludisbuild >/dev/null 2>/dev/null ; then
- if ! groups paludisbuild | grep --quiet '\' ; then
- eerror "The 'paludisbuild' user is now expected to be a member of the"
- eerror "'tty' group. You should add the user to this group before"
- eerror "upgrading Paludis."
- die "Please add paludisbuild to tty group"
- fi
- fi
-
- create-paludis-user
-
- # 'paludis' tries to exec() itself after an upgrade
- if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
- eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
- eerror "'cave' to upgrade."
- die "Can't use 'paludis' to upgrade Paludis"
- fi
-}
-
-src_compile() {
- local repositories=`echo default unavailable unpackaged | tr -s \ ,`
- local environments=`echo default $(usev portage ) | tr -s \ ,`
- econf \
- $(use_enable doc doxygen ) \
- $(use_enable pbins ) \
- $(use_enable pink ) \
- $(use_enable ruby-bindings ruby ) \
- $(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
- $(use_enable prebuilt-documentation ) \
- $(use_enable python-bindings python ) \
- $(use python-bindings && use doc && echo --enable-python-doc ) \
- $(use_enable vim-syntax vim ) \
- $(use_enable visibility ) \
- $(use_enable xml ) \
- $(use_enable search-index ) \
- $(use_enable test gtest ) \
- --with-vim-install-dir=/usr/share/vim/vimfiles \
- --with-repositories=${repositories} \
- --with-environments=${environments} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS README NEWS
-
- BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins zsh-completion/_cave
- fi
-}
-
-src_test() {
- # Work around Portage bugs
- export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
- export BASH_ENV=/dev/null
-
- if [[ `id -u` == 0 ]] ; then
- # hate
- export PALUDIS_REDUCED_UID=0
- export PALUDIS_REDUCED_GID=0
- fi
-
- if ! emake check ; then
- eerror "Tests failed. Looking for files for you to add to your bug report..."
- find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
- eerror " $a"
- done
- die "Make check failed"
- fi
-}
-
-pkg_postinst() {
- pm_is_paludis=false
- if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
- pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
- fi
-
- if ! $pm_is_paludis ; then
- elog "If you are using paludis or cave as your primary package manager,"
- elog "you should consider running:"
- elog " eselect package-manager set paludis"
- fi
-}
diff --git a/sys-boot/grub/grub-2.00-r2.ebuild b/sys-boot/grub/grub-2.00-r2.ebuild
index 0df6651db8e4..292995b2e1e1 100644
--- a/sys-boot/grub/grub-2.00-r2.ebuild
+++ b/sys-boot/grub/grub-2.00-r2.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/sys-boot/grub/grub-2.00-r2.ebuild,v 1.3 2013/02/04 17:29:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.4 2013/02/05 17:14:03 floppym Exp $
EAPI=4
@@ -46,7 +46,8 @@ GRUB_PLATFORMS=(
)
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
-REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+ grub_platforms_yeeloong? ( truetype )"
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -82,12 +83,15 @@ DEPEND="${RDEPEND}
)
"
RDEPEND+="
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
DEPEND+=" >=sys-devel/autogen-5.10"
-else
+fi
+if [[ ${PV} != 9999 ]]; then
DEPEND+=" app-arch/xz-utils"
fi
@@ -234,6 +238,8 @@ src_prepare() {
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
+ epatch "${FILESDIR}/${P}-freebsd.patch" #442050
+ epatch "${FILESDIR}/${P}-compression.patch" #424527
epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
fi
@@ -274,6 +280,7 @@ src_configure() {
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
+ use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
@@ -337,6 +344,7 @@ pkg_preinst() {
display_zfs_feature_flag_warning=$?
}
+
pkg_postinst() {
# display the link to guide
elog "For information on how to configure grub-2 please refer to the guide:"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index db2e902b8407..ad50af6d2f3e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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/sys-boot/grub/grub-9999.ebuild,v 1.85 2012/10/20 21:46:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.86 2013/02/05 17:14:03 floppym Exp $
EAPI=4
@@ -46,7 +46,8 @@ GRUB_PLATFORMS=(
)
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
-REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+ grub_platforms_yeeloong? ( truetype )"
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -82,12 +83,15 @@ DEPEND="${RDEPEND}
)
"
RDEPEND+="
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
"
if [[ -n ${DO_AUTORECONF} ]] ; then
DEPEND+=" >=sys-devel/autogen-5.10"
-else
+fi
+if [[ ${PV} != 9999 ]]; then
DEPEND+=" app-arch/xz-utils"
fi
@@ -234,6 +238,9 @@ src_prepare() {
epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
+ epatch "${FILESDIR}/${P}-freebsd.patch" #442050
+ epatch "${FILESDIR}/${P}-compression.patch" #424527
+ epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
fi
# fix texinfo file name, bug 416035
@@ -273,6 +280,7 @@ src_configure() {
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
+ use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
@@ -330,6 +338,13 @@ src_install() {
newins "${FILESDIR}"/grub.default-2 grub
}
+pkg_preinst() {
+ has_version "1{print $2}')" = 'zfs' ]]
+ display_zfs_feature_flag_warning=$?
+}
+
+
pkg_postinst() {
# display the link to guide
elog "For information on how to configure grub-2 please refer to the guide:"
@@ -345,4 +360,12 @@ pkg_postinst() {
ewarn "the following to add sys-boot/grub:0 to your world file."
ewarn "emerge --noreplace sys-boot/grub:0"
fi
+ if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
+ zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
+ zfs_pool=${zfs_pool%%/*}
+ ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
+ ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
+ ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
+ ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
+ fi
}
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index bd7ab064073f..8d2d1273ab48 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1 +1,2 @@
DIST udev-init-scripts-22.tar.bz2 4877 SHA256 1cb74fe6f418e5ace297efb72682a92e0a81e387afefae3f8e4b619ee2129d51 SHA512 5b11b639d98a1e2edc932887ed51b45119c14f26217e8fe44bdbb9dd4605230e2f83f2ad582eb00d88912c643ba604e38b2a3d52b3573706e861596cca1335ea WHIRLPOOL 7af3709f1824016fd3d7efd319efcaff4a109282ad75d4c43fe981308a641712a17df2f55e2ec7c6a714ad134eacb48b84abf3fe65c0443b94a632ce3113ee51
+DIST udev-init-scripts-23.tar.bz2 4438 SHA256 38759cefae630ce7ad5ccca4e16c41da64a96f60508a9a8087ad9ff0f7de8b99 SHA512 49d7af884ba1c82889169b4710a399653c8be6a621a80266b3a9232994bce3fbe9b9360b998595617ab78f2658f77b7002584c7cfb31e794ccae0a16a1a0405b WHIRLPOOL 2a977e0bbed64bad09ea4514e00941e59b050c268b18502fbe7840ac91454ae4754cac6d20fcb479cecb1b9412a03c370b9ca69173a9ac21c18c872b927c54e6
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-23.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-23.ebuild
new file mode 100644
index 000000000000..b6787ceb2b58
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-23.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-23.ebuild,v 1.1 2013/02/05 15:06:02 williamh Exp $
+
+EAPI=4
+
+inherit eutils
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
+ inherit git-2
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [ "${PV}" != "9999" ]; then
+ SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=virtual/udev-180
+ sys-apps/openrc
+ !
+Date: Mon, 4 Feb 2013 16:35:54 -0800
+Subject: [PATCH] Cast 'zfs bad bloc' to ULL for x86
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Explicitly case this value to an unsigned long long for 32-bit
+systems to inform the compiler that a long type should not be
+used. Otherwise we get the following compiler error:
+
+ dmu_send.c:376: error: integer constant is too large for
+ ‘long’ type
+
+Signed-off-by: Brian Behlendorf
+---
+ module/zfs/dmu_send.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
+index 0cf3c4a..921c3d7 100644
+--- a/module/zfs/dmu_send.c
++++ b/module/zfs/dmu_send.c
+@@ -373,7 +373,7 @@
+ for (ptr = abuf->b_data;
+ (char *)ptr < (char *)abuf->b_data + blksz;
+ ptr++)
+- *ptr = 0x2f5baddb10c;
++ *ptr = 0x2f5baddb10cULL;
+ } else {
+ return (EIO);
+ }
+--
+1.7.10
+
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
index 862eafcac912..f6cf83536912 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.6 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.7 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
index 817922745fc2..3911ca9c4ed8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
index 325d5ba73415..3369d4e9cd68 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
index 66fc86270b28..b0934e129fa8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild,v 1.1 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
index 21c15f46827d..b5b07cf94f3a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
index 028bc059059b..2479d9f723b8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild,v 1.2 2013/01/14 21:11:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild
index 226ebb56ae3d..e02d5c64772c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild,v 1.1 2013/01/16 08:57:38 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
index f39156fcf50d..867b8060a78f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild,v 1.1 2012/12/23 05:44:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild
similarity index 91%
rename from sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild
rename to sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild
index c1348454a2ba..90facf83aee5 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-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/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild,v 1.2 2013/02/03 22:43:08 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
@@ -61,6 +62,11 @@ pkg_setup() {
}
src_prepare() {
+ if [ ${PV} != "9999" ]
+ then
+ # Cast constant for 32-bit compatibility
+ epatch "${FILESDIR}/${P}-cast-const-for-32bit-compatibility.patch"
+ fi
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index c38cc854efa7..c152342dddbc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-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/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.8 2013/01/16 09:01:09 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.9 2013/02/06 01:46:26 ryao Exp $
EAPI="4"
@@ -31,6 +31,7 @@ RESTRICT="test"
DEPEND="
=sys-kernel/spl-${PV}*
+ virtual/awk
"
RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
new file mode 100644
index 000000000000..b493424a1e77
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
@@ -0,0 +1,34 @@
+From 399f60c8b47f7513d078a7c181ff132e2cafdd15 Mon Sep 17 00:00:00 2001
+From: Richard Yao
+Date: Tue, 5 Feb 2013 18:14:30 -0500
+Subject: [PATCH] Fix function relocations in libzpool
+
+binutils 2.23.1 fails in situations that generate function relocations
+on PowerPC and possibly other architectures. This causes linking of
+libzpool to fail because it depends on libnvpair. We add a dependency on
+libnvpair to lib/libzpool/Makefile.am to correct that.
+
+Signed-off-by: Richard Yao
+Signed-off-by: Brian Behlendorf
+Closes #1267
+---
+ lib/libzpool/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
+index 3e62de6..cbba388 100644
+--- a/lib/libzpool/Makefile.am
++++ b/lib/libzpool/Makefile.am
+@@ -94,7 +94,8 @@ libzpool_la_SOURCES = \
+
+ libzpool_la_LIBADD = \
+ $(top_builddir)/lib/libunicode/libunicode.la \
+- $(top_builddir)/lib/libuutil/libuutil.la
++ $(top_builddir)/lib/libuutil/libuutil.la \
++ $(top_builddir)/lib/libnvpair/libnvpair.la
+
+ libzpool_la_LDFLAGS = -pthread -version-info 1:1:0
+
+--
+1.7.10
+
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
similarity index 86%
rename from sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
index fbff131b2432..b791feabc494 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r4.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/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
similarity index 86%
rename from sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
index 2dbff4613bed..caecdbb4e5c9 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc11-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/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
similarity index 86%
rename from sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
index 81c4c4bb5a1c..c22c174a7d67 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc12-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/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild
similarity index 88%
rename from sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild
index a39d74c87084..af7e4b95a203 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc13-r2.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/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild,v 1.3 2013/01/23 14:20:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -63,10 +63,11 @@ pkg_setup() {
}
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild
similarity index 86%
rename from sys-fs/zfs/zfs-0.6.0_rc14.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild
index e912e4916ea3..bac233e1abd2 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc14-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/sys-fs/zfs/zfs-0.6.0_rc14.ebuild,v 1.3 2013/02/04 17:31:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -64,10 +64,16 @@ pkg_setup() {
}
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
+
+ if [ ${PV} != "9999" ]
+ then
+ epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch"
+ fi
autotools-utils_src_prepare
}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 46918d1d8fb3..6711c511b9f5 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-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/sys-fs/zfs/zfs-9999.ebuild,v 1.43 2013/02/04 17:31:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.44 2013/02/06 01:48:50 ryao Exp $
EAPI="4"
@@ -32,6 +32,7 @@ RESTRICT="test"
COMMON_DEPEND="
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
+ virtual/awk
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( virtual/udev )
test-suite? (
- sys-apps/gawk
sys-apps/util-linux
sys-devel/bc
sys-block/parted
@@ -64,10 +64,16 @@ pkg_setup() {
}
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
+
+ if [ ${PV} != "9999" ]
+ then
+ epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch"
+ fi
autotools-utils_src_prepare
}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index b35524b5872c..d1b43c67640d 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -4,3 +4,4 @@ DIST linux-firmware-20120909.tar.xz 15823568 SHA256 a7ba26a5714a71e5eddf078d1ef2
DIST linux-firmware-20120924.tar.xz 16379936 SHA256 0e52f67fb866d0d147f1c952f597885defd7f825d516b316a6779e8a0381adb3 SHA512 1b274a00c5717ea1d45e5c791ce5fc8da96a36d57e8badba5d187cf9cb74f9f32d851d5d623056b07c23e64881675638a57f156ae51d87cb626954e2c571b077 WHIRLPOOL a99393dd3c3eae15e73dfa91166836ef9848a2a7806334e4cab291bcbda8cc60772b6235f9693ff06036b3c58eee3b4da880907ba7564d764c8a67bce4bf5dc4
DIST linux-firmware-20121030.tar.xz 16435076 SHA256 16d738bb6c9c0c66d753d7f69dc78601b6c0c1678a86d4724cf360c8c3625f00 SHA512 8ea0c5da285a22c881f64d60ca0c2edbcc88ffa299e93709a51c1f119d2628e93db50be0dc323e6bae53c8bc3e1fe60fb8ed44954a73a1a3f66ab2deabf30328 WHIRLPOOL 4de66a00eec7605e9811190f2df9faacfeac491af59e9ed711897222914234babd941ab9884e75b64ae25e267b2711799a8e32070347a645f591c969a20c90ea
DIST linux-firmware-20121225.tar.xz 16979700 SHA256 dccad06330fcfc1e29f771c24e023846e641afeda27dbd7f221ad3c18dc96259 SHA512 746fcf332b74049995a1236d126153b0f971d7ffe365178835f3cd424d5544db16ee74de22c03253874220cbaceb7fceee5bb4d147072c365b3adbcf924796c0 WHIRLPOOL 27c308029ed17151624ff5ec7a285b85ce52053c6b2040afd58ac27bacad22dbf7555cf7e20b5f942ea94a1c06e11552c6a46759d79fca740623d7c968b3682c
+DIST linux-firmware-20130113.tar.xz 18590492 SHA256 559100d43fc53d697e8a0bdb7b8f3674bd8be030d720a5367fba94c3f6affed7 SHA512 f66440651b03a7999d480fdcc9a529f04e32d033233d0aa50cd1f76f0b8549a0299aa76c515a544a2fddaf7de69637d56a51849cb4b5568b1fc7ff2c27f43dbd WHIRLPOOL 7a6883e2d5eb52eab1a5b8214244a6a9a661047ead258eb8b717820e5e44ddc0b63e574fe2376351239286726d13942caa7ce810147ab49496eb563b5b0e8d5a
diff --git a/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild
new file mode 100644
index 000000000000..e677d2b58a58
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130113.ebuild,v 1.1 2013/02/06 00:10:18 zerochaos Exp $
+
+EAPI=5
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+ !media-sound/alsa-firmware[alsa_cards_korg1212]
+ !media-sound/alsa-firmware[alsa_cards_maestro3]
+ !media-sound/alsa-firmware[alsa_cards_sb16]
+ !media-sound/alsa-firmware[alsa_cards_ymfpci]
+ !media-tv/cx18-firmware
+ !media-tv/ivtv-firmware
+ !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+ !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+ !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+ !net-dialup/ueagle-atm
+ !net-dialup/ueagle4-atm
+ !net-wireless/ar9271-firmware
+ !net-wireless/i2400m-fw
+ !net-wireless/libertas-firmware
+ !net-wireless/rt61-firmware
+ !net-wireless/rt73-firmware
+ !net-wireless/rt2860-firmware
+ !net-wireless/rt2870-firmware
+ !sys-block/qla-fc-firmware
+ !sys-firmware/iwl1000-ucode
+ !sys-firmware/iwl2000-ucode
+ !sys-firmware/iwl2030-ucode
+ !sys-firmware/iwl3945-ucode
+ !sys-firmware/iwl4965-ucode
+ !sys-firmware/iwl5000-ucode
+ !sys-firmware/iwl5150-ucode
+ !sys-firmware/iwl6000-ucode
+ !sys-firmware/iwl6005-ucode
+ !sys-firmware/iwl6030-ucode
+ !sys-firmware/iwl6050-ucode
+ !x11-drivers/radeon-ucode
+ )"
+#add anything else that collides to this
+
+src_unpack() {
+ if [[ ${PV} == 99999999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ # rename directory from git snapshot tarball
+ mv ${PN}-*/ ${P} || die
+ fi
+}
+
+src_prepare() {
+ echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+ find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+ if use savedconfig; then
+ restore_config ${PN}.conf
+ ebegin "Removing all files not listed in config"
+ find * \( \! -type d -and \! -name ${PN}.conf \) \
+ | sort ${PN}.conf ${PN}.conf - \
+ | uniq -u | xargs -r rm
+ eend $? || die
+ # remove empty directories, bug #396073
+ find -type d -empty -delete || die
+ fi
+}
+
+src_install() {
+ save_config ${PN}.conf
+ rm ${PN}.conf || die
+ insinto /lib/firmware/
+ doins -r *
+}
+
+pkg_preinst() {
+ if use savedconfig; then
+ ewarn "USE=savedconfig is active. You must handle file collisions manually."
+ fi
+}
+
+pkg_postinst() {
+ elog "If you are only interested in particular firmware files, edit the saved"
+ elog "configfile and remove those that you do not want."
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 59d4341ad00f..6dd5db6a3835 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,23 +1,24 @@
-# 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/linux-firmware/linux-firmware-99999999.ebuild,v 1.20 2012/10/03 20:45:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.21 2013/02/06 00:10:18 zerochaos Exp $
-EAPI=4
+EAPI=5
inherit savedconfig
if [[ ${PV} == 99999999* ]]; then
inherit git-2
SRC_URI=""
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+ KEYWORDS=""
else
SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ia64 ~x86"
fi
DESCRIPTION="Linux firmware files"
HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS=""
SLOT="0"
IUSE="savedconfig"
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index e7f764657405..dcf83e73e454 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -10,6 +10,10 @@
chithanh@gentoo.org
ChÃ-Thanh Christopher Nguyá»…n
+
+ zerochaos@gentoo.org
+ Rick Farina
+
Allows individual selection of firmware files
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
new file mode 100644
index 000000000000..9ac8a4308dd6
--- /dev/null
+++ b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
@@ -0,0 +1,70 @@
+From dd3678fc29d75286b57e705454bbd7e60e1b44e0 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf
+Date: Tue, 5 Feb 2013 09:35:43 -0800
+Subject: [PATCH] Fix atomic64_* autoconf checks
+
+The SPL_AC_ATOMIC_SPINLOCK, SPL_AC_TYPE_ATOMIC64_CMPXCHG, and
+SPL_AC_TYPE_ATOMIC64_XCHG were all directly including the
+'asm/atomic.h' header. As of Linux 3.4 this header was removed
+which results in a build failure.
+
+The right thing to do is include 'linux/atomic.h' however we
+can't safely do this because it doesn't exist in 2.6.26 kernels.
+Therefore, we include 'linux/fs.h' which in turn includes the
+correct atomic header regardless of the kernel version.
+
+When these incorrect APIs are used in ZFS the following build
+failure results.
+
+ arc.c:791:80: warning: '__ret' may be used uninitialized
+ in this function [-Wuninitialized]
+ arc.c:791:1875: error: call to '__cmpxchg_wrong_size'
+ declared with attribute error: Bad argument size for cmpxchg
+
+Since this is all Linux 2.6.24 compatibility code there's
+an argument to be made that it should be removed because
+kernels this old are not supported. However, because we're
+so close to a release I'm going to leave it in place for now.
+
+Signed-off-by: Brian Behlendorf
+Closes zfsonlinux/zfs#814
+Closes zfsonlinux/zfs#1254
+---
+ config/spl-build.m4 | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index e9695de..8518404 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -777,7 +777,7 @@ AC_DEFUN([SPL_AC_ATOMIC_SPINLOCK], [
+ [enable_atomic_spinlocks=check])
+
+ SPL_LINUX_TRY_COMPILE([
+- #include
++ #include
+ ],[
+ atomic64_t *ptr __attribute__ ((unused));
+ ],[
+@@ -820,8 +820,7 @@ dnl #
+ AC_DEFUN([SPL_AC_TYPE_ATOMIC64_CMPXCHG],
+ [AC_MSG_CHECKING([whether kernel defines atomic64_cmpxchg])
+ SPL_LINUX_TRY_COMPILE([
+- #include
+- #include
++ #include
+ ],[
+ atomic64_cmpxchg((atomic64_t *)NULL, 0, 0);
+ ],[
+@@ -840,7 +839,7 @@ dnl #
+ AC_DEFUN([SPL_AC_TYPE_ATOMIC64_XCHG],
+ [AC_MSG_CHECKING([whether kernel defines atomic64_xchg])
+ SPL_LINUX_TRY_COMPILE([
+- #include
++ #include
+ ],[
+ atomic64_xchg((atomic64_t *)NULL, 0);
+ ],[
+--
+1.7.10
+
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
new file mode 100644
index 000000000000..ee7314d3cf32
--- /dev/null
+++ b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
@@ -0,0 +1,33 @@
+From a0625691b39468d04eb716919e237f96a3987b48 Mon Sep 17 00:00:00 2001
+From: Richard Yao
+Date: Tue, 5 Feb 2013 16:42:29 -0500
+Subject: [PATCH] Fix HAVE_MUTEX_OWNER_TASK_STRUCT autotools check on PPC64
+
+The HAVE_MUTEX_OWNER_TASK_STRUCT fails on PPC64 with the following
+error:
+
+error: 'current' undeclared (first use in this function)
+
+We include linux/sched.h to ensure that current is available.
+
+Signed-off-by: Richard Yao
+Signed-off-by: Brian Behlendorf
+---
+ config/spl-build.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index 8518404..4cb7e1d 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -1269,6 +1269,7 @@ AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
+ EXTRA_KCFLAGS="-Werror"
+ SPL_LINUX_TRY_COMPILE([
+ #include
++ #include
+ ],[
+ struct mutex mtx __attribute__ ((unused));
+ mtx.owner = current;
+--
+1.7.10
+
diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
index acf1d8773a05..af7374fd0c6e 100644
--- a/sys-kernel/spl/spl-0.6.0_rc10.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc10.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/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.6 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.7 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
index 9d5bfe751060..48b390d678a2 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11-r2.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/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.5 2013/01/14 21:07:59 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.6 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc11.ebuild b/sys-kernel/spl/spl-0.6.0_rc11.ebuild
index 1debe2581c31..b0c94a761ee7 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11.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/sys-kernel/spl/spl-0.6.0_rc11.ebuild,v 1.4 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
index ffc5a8791ad9..4e3222b8a5b0 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12-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/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.3 2012/12/27 11:47:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.4 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc12.ebuild b/sys-kernel/spl/spl-0.6.0_rc12.ebuild
index 65ed31c65201..a89c8124f102 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12.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/sys-kernel/spl/spl-0.6.0_rc12.ebuild,v 1.4 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
index bef98ca40a7d..b176845c609f 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-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/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild,v 1.2 2013/01/14 21:11:56 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
index a7b7e1849223..35fa279d54bd 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-r2.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/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.1 2013/01/16 08:57:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13.ebuild b/sys-kernel/spl/spl-0.6.0_rc13.ebuild
index f28b0bce4a5a..e6f36dc0bb1d 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13.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/sys-kernel/spl/spl-0.6.0_rc13.ebuild,v 1.2 2012/12/27 11:47:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc14.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild
similarity index 83%
rename from sys-kernel/spl/spl-0.6.0_rc14.ebuild
rename to sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild
index 21275d398637..3d577aed0472 100644
--- a/sys-kernel/spl/spl-0.6.0_rc14.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc14-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/sys-kernel/spl/spl-0.6.0_rc14.ebuild,v 1.1 2013/02/02 16:44:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
@@ -54,6 +59,15 @@ src_prepare() {
# Workaround for hard coded path
sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
+ if [ ${PV} != "9999" ]
+ then
+ # Fix x86 build failures on Linux 3.4 and later, bug #450646
+ epatch "${FILESDIR}/${P}-fix-atomic64-checks.patch"
+
+ # Fix autotools check that fails on ~ppc64
+ epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch"
+ fi
+
autotools-utils_src_prepare
}
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index b8b0babe8c4c..accfa2a6d55f 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-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/sys-kernel/spl/spl-9999.ebuild,v 1.27 2013/01/16 09:01:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.28 2013/02/06 01:45:21 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
IUSE="custom-cflags debug debug-log"
RESTRICT="test"
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-devel/spl"
AT_M4DIR="config"
AUTOTOOLS_IN_SOURCE_BUILD="1"
@@ -56,11 +61,11 @@ src_prepare() {
if [ ${PV} != "9999" ]
then
- # Fix on_each_cpu autotools to work correctly
- epatch "${FILESDIR}/${P}-fix-on_each_cpu-autotools-check.patch"
+ # Fix x86 build failures on Linux 3.4 and later, bug #450646
+ epatch "${FILESDIR}/${P}-fix-atomic64-checks.patch"
- # Fix soft lockup regression
- epatch "${FILESDIR}/${P}-fix-soft-lockup.patch"
+ # Fix autotools check that fails on ~ppc64
+ epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch"
fi
autotools-utils_src_prepare
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 287f680c8820..1be5c277032f 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,2 @@
-DIST libosinfo-0.2.0.tar.gz 1009090 SHA256 6aa68ad635afd6e86cb8c54c28c8b02658782b5072eac5ba6db421c0c3cc8916 SHA512 b778bb358b35082cfd4ed9fa1db792a550b4c62099c318e6e798585e314a95c693a54992028386b667f98c4e834bf0c6e555a5693a67bf99305763b24e209677 WHIRLPOOL 085538cc6e7e12223c47e688903e38d850138a0c875b6d257f5261cbad9191c9c01b23a225aec0c2c79593c333270f661a3e24f93375a1b6cfc5eb1999e22c0a
-DIST libosinfo-0.2.1.tar.gz 1019526 SHA256 37a5ae12b01a3367220ba44d4ace7065dc40972e82eb2439059c5f11724ecda5 SHA512 8a9bbda5795fb2d71b5a5d4113dd88cf7a840e3602c9b99f1b17a83b5ec4c7c2068241e8b2d789f3dec9de5d5a522d774caddcaaa0859ff0b687166667e51ca8 WHIRLPOOL 248750e10f3a7e5a821d84ade21f7de0a009033b2be03383bff37431a61ac97f3b9ec24dcd4c4072da27c493fa7048ea9e565166cdde63dc0d98fd7e16e4a914
DIST libosinfo-0.2.2.tar.gz 1162812 SHA256 8e2c6a32fe2deea84c6b74613a88eed6cb3bf913ad47fd1177be149b90b3d3e8 SHA512 f682e53d3e4a3ecd288f2e928357bbb95a536d2fc87928b5205211a8d02a906ec8288f27b493598dbc8d9bb613a9e7fe0ad9f3f6bb76d946ec762d4a38a6321d WHIRLPOOL 4d180c772ba50401306073f25bec5fd37fcf31cafaa46a41f14466cb63fd2fc01d0224a54e62cd9545a7d7daeab34ed8e9e2e3d8e8d7cb08a583bb71155a135a
+DIST libosinfo-0.2.3.tar.gz 1216559 SHA256 cb7438133da09b7fb35a56f2af493134e5d3e5e42bacc4a42d1eff67d7f027df SHA512 28e2db1a61677fa821fc35f03494c47fbe7f47e2ba03883058039f9ba869ba49e0f9262f2066e88d76378f82bfaf9015ac236a8215e1fb8ce0b071f579c41a20 WHIRLPOOL 132cf10b95a6d4ab5bf50a4773faa82c2804bf97b999969752a6f341081923d1de98f51183bc2e8374fb23d9b54e9e00270e494817408675098c52d998946a8e
diff --git a/sys-libs/libosinfo/libosinfo-0.2.0.ebuild b/sys-libs/libosinfo/libosinfo-0.2.0.ebuild
deleted file mode 100644
index 4035d4733edd..000000000000
--- a/sys-libs/libosinfo/libosinfo-0.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.0.ebuild,v 1.3 2012/12/11 15:45:42 ssuominen Exp $
-
-EAPI=4
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils toolchain-funcs vala udev
-
-DESCRIPTION="GObject library for managing information about real and virtual OSes"
-HOMEPAGE="http://fedorahosted.org/libosinfo/"
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection +vala test"
-
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2
- >=dev-libs/libxslt-1.0.0
- dev-libs/libxml2
- net-libs/libsoup:2.4
- net-libs/libsoup-gnome:2.4
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.10 )
- test? ( dev-libs/check )
- vala? ( $(vala_depend) )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # --enable-udev is only for rules.d file install
- econf \
- --disable-static \
- --disable-silent-rules \
- $(use_enable doc gtk-doc) \
- $(use_enable test tests) \
- $(use_enable introspection) \
- $(use_enable vala) \
- --enable-udev \
- --disable-coverage \
- --with-udev-rulesdir="$(udev_get_udevdir)"/rules.d \
- --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/sys-libs/libosinfo/libosinfo-0.2.1.ebuild b/sys-libs/libosinfo/libosinfo-0.2.3.ebuild
similarity index 78%
rename from sys-libs/libosinfo/libosinfo-0.2.1.ebuild
rename to sys-libs/libosinfo/libosinfo-0.2.3.ebuild
index 7bd1c104f602..52f1dadd6d13 100644
--- a/sys-libs/libosinfo/libosinfo-0.2.1.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.2.3.ebuild
@@ -1,8 +1,8 @@
-# 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-libs/libosinfo/libosinfo-0.2.1.ebuild,v 1.2 2012/12/11 15:45:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.3.ebuild,v 1.1 2013/02/05 20:02:30 pacho Exp $
-EAPI=4
+EAPI=5
VALA_MIN_API_VERSION="0.16"
VALA_USE_DEPEND="vapigen"
@@ -14,32 +14,27 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection +vala test"
REQUIRED_USE="vala? ( introspection )"
RDEPEND=">=dev-libs/glib-2:2
- >=dev-libs/libxslt-1.0.0
- dev-libs/libxml2
+ >=dev-libs/libxslt-1.0.0:=
+ dev-libs/libxml2:=
net-libs/libsoup:2.4
net-libs/libsoup-gnome:2.4
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )"
DEPEND="${RDEPEND}
dev-util/gtk-doc-am
virtual/pkgconfig
test? ( dev-libs/check )
vala? ( $(vala_depend) )"
-src_prepare() {
- use vala && vala_src_prepare
-}
-
src_configure() {
# --enable-udev is only for rules.d file install
econf \
--disable-static \
- --disable-silent-rules \
$(use_enable test tests) \
$(use_enable introspection) \
$(use_enable vala) \
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d67a314b11fb..0d8147bc2fa7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,6 @@
-DIST chromium-24.0.1312.52.tar.bz2 186302423 SHA256 f30df8b0f4c999185bb11d873f0caa5d8bc581eb4f37ce0fe85fb7900a01d711 SHA512 9908614f0237c986354e2a303d76945d1875526ad6a13ec8082b463fa02b7dcda8dcb1f59e0bd77940dd4109b9ececc0470df922919e9625fa2710b2a261cbc8 WHIRLPOOL 7fc9dc20ae63473b5c8b5301a712e5d233af7d48732d8be6ccaef706642b6a087efc883774871264a61d77028125ebf41039b1e2ec45bf31b9fe00e4eb8d16ce
DIST chromium-24.0.1312.56.tar.bz2 186319895 SHA256 120bc74c72498916f44efebe32703e2a52e45ba7e6c536f465144816270b2c11 SHA512 4446396da443daa408a7fa23c721ab0a8331b9bf2ecc11ad072e4e98a2aa6968dce47a5fa58521e08215a6ea35e66b6032a94103a1c2b0df40fb1de5816e7a8b WHIRLPOOL f6850adfa853e217bf33c43b8b15e5446a1688527f53ef31855d019c16092a524b6a31342db713d4af10cbed54d59dddfbc36c3c9f9b32eba87526b89cbfe593
-DIST chromium-25.0.1364.45-lite.tar.bz2 125402473 SHA256 d0fa28f7ad13942af7301b26f747b09562b885d6251d38a73a1a62966ecf433f SHA512 cfc69b5f6be1f87986353c8b6df5d064219e573f526edc2e2cc7a3ae0fddef31868b5075167dbb969813c1ddb684672e54d8da54dd45ae439e5f36bc02e66087 WHIRLPOOL a8f490012c8abafdfe3c83fbcce50ee718f7e28bca88f5bf2fa2a69c76f7666451dc5181e1ca09ebca14bd4e3f9e309b5858e5929d231cd5144ea54eef7c5e5e
DIST chromium-25.0.1364.58-lite.tar.bz2 125415539 SHA256 f6431601339f5de8bbdecb3fd3b7e4133cec8bb9ca0b90f28c251a35bccdf1bb SHA512 67952a02b39bfc711fdff89e449a5b084dac31770e05026f0e8752203f9f6aa212d92f47a32946de799f916ba9414e721d8b528a6e8bb1ae6009aaa01f124ae5 WHIRLPOOL 61fd1f8307ef374cb4feca3ac27b0a90b6389fd4432c3fe8e0a73e5700a6a78e52bc6793399ce834d775e6655d9c1d476141512edda922ec3343dc8f8d6a86ac
+DIST chromium-25.0.1364.68-lite.tar.bz2 125813064 SHA256 06516106a90ec7e14fb70edb314a3b6d4456ba1b311e4e9449b512900e9eaea5 SHA512 889aabe3a21b5697c1d4054bda6290d12f0c4ff97894d56d02c6318d51ee7017838d3f395416fcbc10e9bd22aee9c5a2b3826699118b6415b5c1eddae014db5c WHIRLPOOL 7ee341518d9347b4402c29e9b3ee91a3ca6df854efdd426cbc07305d40a0900f49a11c8600c0658d9313a1d01d24fa782b414d314fa24a8d349b3d19645be475
DIST chromium-26.0.1384.2-lite.tar.xz 103884752 SHA256 624d5ffc6939818172c8c76c49d736e0a2171133e5be39a55a32e6413ed3b82b SHA512 5989b337a6aac03418531c4b681980debbd7f291ea982065110657cc45f6f2f0549f0c40f0d212d21ec8e9fed10ff589ac111f03d3b00a1bc69c73ea62443f1d WHIRLPOOL 6729eb5354879872d417d04812b29e0ce7f62fe9a00f0efa95f77d09e97cd3f5b8ff7bae96ca68654e4e29395cbc05ece66b963df932c9d968bc790f626a0a3e
DIST chromium-26.0.1386.0-lite.tar.xz 104034868 SHA256 1e99751df931f877327506cba1b1958c670abe449f88f0e3880bb418370d389f SHA512 9781ce24973835e39a0078a3feb162f830cc4e590fc7446314d02cbcb1b793ac5b95c5808f6576506f6da35afe53948ed8b39460c972b073278ebb3a7b0a37fd WHIRLPOOL 9af7bf3fcf03823f040f007e4adff223ea162d816f7789802220e42ef667aa702e18c12859e7293cad7ca518523aa74ef2d80af150f51789df13475e5bd65d25
DIST chromium-26.0.1403.0.tar.xz 140497404 SHA256 8eef12f629a22220e79797ed7c716a805f920092b46ca64b364fdb21db803d2e SHA512 a9160797e2996d2aa87d1f219ef323c43fddc3ea9db909e1d327c59fa7164f8f453fa0c381647daf09d78a1cc968a9a059a1ca700dfdf44e282934f7c364f16c WHIRLPOOL 6312ca67494008d23ce273d6f2572e949e734bf0b440954c53a3a9d7f4c194dcd7ade8f522824a142420779224b529fe26420d6a159bbb6a9249c6d8413d90b4
diff --git a/www-client/chromium/chromium-24.0.1312.52.ebuild b/www-client/chromium/chromium-24.0.1312.52.ebuild
deleted file mode 100644
index 8d82118a28f5..000000000000
--- a/www-client/chromium/chromium-24.0.1312.52.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-24.0.1312.52.ebuild,v 1.3 2013/01/11 10:05:59 ago Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2:2.6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib \
- pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc"
-
-RDEPEND="app-arch/bzip2
- cups? (
- dev-libs/libgcrypt
- >=net-print/cups-1.3.11
- )
- >=dev-lang/v8-3.14.5:=
- >=dev-libs/elfutils-0.149
- dev-libs/expat
- >=dev-libs/icu-49.1.1-r1
- >=dev-libs/libevent-1.4.13
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- >=dev-libs/nss-3.12.3
- gnome? ( >=gnome-base/gconf-2.24.0 )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
- >=media-libs/alsa-lib-1.0.19
- media-libs/flac
- >=media-libs/libjpeg-turbo-1.2.0-r1
- media-libs/libpng
- media-libs/libvpx
- >=media-libs/libwebp-0.2.0_rc1
- media-libs/opus
- media-libs/speex
- pulseaudio? ( media-sound/pulseaudio )
- sys-apps/dbus
- sys-libs/zlib[minizip]
- virtual/udev
- virtual/libusb:1
- x11-libs/gtk+:2
- x11-libs/libXinerama
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- kerberos? ( virtual/krb5 )
- selinux? (
- sec-policy/selinux-chromium
- sys-libs/libselinux
- )"
-DEPEND="${RDEPEND}
- !arm? (
- >=dev-lang/nacl-toolchain-newlib-0_p9093
- dev-lang/yasm
- )
- dev-lang/perl
- dev-python/ply
- dev-python/simplejson
- >=dev-util/gperf-3.0.3
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- >=sys-devel/make-3.81-r2
- virtual/pkgconfig
- test? ( dev-python/pyftpdlib )"
-RDEPEND+="
- !=www-client/chromium-9999
- x11-misc/xdg-utils
- virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
- if [[ "${SLOT}" == "0" ]]; then
- CHROMIUM_SUFFIX=""
- else
- CHROMIUM_SUFFIX="-${SLOT}"
- fi
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX RANLIB
-
- # Make sure the build system will use the right python, bug #344367.
- python_set_active_version 2
- python_pkg_setup
-
- if ! use selinux; then
- chromium_suid_sandbox_check_kernel_config
- fi
-
- if use bindist; then
- elog "bindist enabled: H.264 video support will be disabled."
- else
- elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
- fi
-}
-
-src_prepare() {
- if ! use arm; then
- ebegin "Preparing NaCl newlib toolchain"
- pushd "${T}" >/dev/null || die
- mkdir sdk || die
- cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
- mkdir -p "${S}"/native_client/toolchain/.tars || die
- tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
- popd >/dev/null || die
- eend $?
- fi
-
- # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
- # sed -i '1i#define OF(x) x' \
- # third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
-
- epatch "${FILESDIR}/${PN}-arm-r0.patch"
-
- # Fix build without NaCl glibc toolchain.
- epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
- # Fix build without NaCl pnacl toolchain.
- epatch "${FILESDIR}/${PN}-no-pnacl-r0.patch"
-
- # Missing gyp files in tarball.
- # https://code.google.com/p/chromium/issues/detail?id=144823
- if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
- die "tarball fixed, please remove workaround"
- fi
-
- mkdir -p chrome/test/data/nacl
- cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
- {
- 'targets': [
- {
- 'target_name': 'nacl_tests',
- 'type': 'none',
- },
- ],
- }
- EOF
-
- epatch_user
-
- # Remove most bundled libraries. Some are still needed.
- find third_party -type f \! -iname '*.gyp*' \
- \! -path 'third_party/WebKit/*' \
- \! -path 'third_party/angle/*' \
- \! -path 'third_party/cacheinvalidation/*' \
- \! -path 'third_party/cld/*' \
- \! -path 'third_party/cros_system_api/*' \
- \! -path 'third_party/ffmpeg/*' \
- \! -path 'third_party/flac/flac.h' \
- \! -path 'third_party/flot/*' \
- \! -path 'third_party/gpsd/*' \
- \! -path 'third_party/harfbuzz/*' \
- \! -path 'third_party/harfbuzz-ng/*' \
- \! -path 'third_party/hunspell/*' \
- \! -path 'third_party/hyphen/*' \
- \! -path 'third_party/iccjpeg/*' \
- \! -path 'third_party/jsoncpp/*' \
- \! -path 'third_party/khronos/*' \
- \! -path 'third_party/leveldatabase/*' \
- \! -path 'third_party/libjingle/*' \
- \! -path 'third_party/libphonenumber/*' \
- \! -path 'third_party/libsrtp/*' \
- \! -path 'third_party/libusb/libusb.h' \
- \! -path 'third_party/libva/*' \
- \! -path 'third_party/libvpx/libvpx.h' \
- \! -path 'third_party/libxml/chromium/*' \
- \! -path 'third_party/libXNVCtrl/*' \
- \! -path 'third_party/libyuv/*' \
- \! -path 'third_party/lss/*' \
- \! -path 'third_party/mesa/*' \
- \! -path 'third_party/modp_b64/*' \
- \! -path 'third_party/mongoose/*' \
- \! -path 'third_party/mt19937ar/*' \
- \! -path 'third_party/npapi/*' \
- \! -path 'third_party/openmax/*' \
- \! -path 'third_party/opus/opus.h*' \
- \! -path 'third_party/ots/*' \
- \! -path 'third_party/protobuf/*' \
- \! -path 'third_party/pywebsocket/*' \
- \! -path 'third_party/qcms/*' \
- \! -path 'third_party/re2/*' \
- \! -path 'third_party/scons-2.0.1/*' \
- \! -path 'third_party/sfntly/*' \
- \! -path 'third_party/skia/*' \
- \! -path 'third_party/smhasher/*' \
- \! -path 'third_party/speex/speex.h' \
- \! -path 'third_party/sqlite/*' \
- \! -path 'third_party/tcmalloc/*' \
- \! -path 'third_party/tlslite/*' \
- \! -path 'third_party/trace-viewer/*' \
- \! -path 'third_party/undoview/*' \
- \! -path 'third_party/v8-i18n/*' \
- \! -path 'third_party/webdriver/*' \
- \! -path 'third_party/webgl_conformance/*' \
- \! -path 'third_party/webrtc/*' \
- \! -path 'third_party/widevine/*' \
- -delete || die
-
- local v8_bundled="$(chromium_bundled_v8_version)"
- local v8_installed="$(chromium_installed_v8_version)"
- einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
- # Remove bundled v8.
- find v8 -type f \! -iname '*.gyp*' -delete || die
-
- # The implementation files include v8 headers with full path,
- # like #include "v8/include/v8.h". Make sure the system headers
- # will be used.
- # TODO: find a solution that can be upstreamed.
- rmdir v8/include || die
- ln -s /usr/include v8/include || die
-}
-
-src_configure() {
- local myconf=""
-
- # Never tell the build system to "enable" SSE2, it has a few unexpected
- # additions, bug #336871.
- myconf+=" -Ddisable_sse2=1"
-
- # Optional tcmalloc. Note it causes problems with e.g. NVIDIA
- # drivers, bug #413637.
- myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
- # Disable glibc Native Client toolchain, we don't need it (bug #417019).
- myconf+=" -Ddisable_glibc=1"
-
- # TODO: also build with pnacl
- myconf+=" -Ddisable_pnacl=1"
-
- # Make it possible to remove third_party/adobe.
- echo > "${T}/flapper_version.h" || die
- myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
- # Use system-provided libraries.
- # TODO: use_system_ffmpeg
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #348600).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
- myconf+="
- -Duse_system_bzip2=1
- -Duse_system_flac=1
- -Duse_system_icu=1
- -Duse_system_libevent=1
- -Duse_system_libjpeg=1
- -Duse_system_libpng=1
- -Duse_system_libusb=1
- -Duse_system_libvpx=1
- -Duse_system_libwebp=1
- -Duse_system_libxml=1
- -Duse_system_minizip=1
- -Duse_system_opus=1
- -Duse_system_speex=1
- -Duse_system_v8=1
- -Duse_system_xdg_utils=1
- -Duse_system_yasm=1
- -Duse_system_zlib=1"
-
- # Optional dependencies.
- # TODO: linux_link_kerberos, bug #381289.
- myconf+="
- $(gyp_use cups)
- $(gyp_use gnome use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use kerberos)
- $(gyp_use pulseaudio)
- $(gyp_use selinux selinux)"
-
- # Use explicit library dependencies instead of dlopen.
- # This makes breakages easier to detect by revdep-rebuild.
- myconf+="
- -Dlinux_link_gsettings=1"
-
- if ! use selinux; then
- # Enable SUID sandbox.
- myconf+="
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- myconf+="
- -Dlinux_use_gold_binary=0
- -Dlinux_use_gold_flags=0"
-
- if ! use bindist; then
- # Enable H.624 support in bundled ffmpeg.
- myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
- fi
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
- -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
- -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- myconf+=" -Dtarget_arch=x64"
- elif [[ $myarch = x86 ]] ; then
- myconf+=" -Dtarget_arch=ia32"
- elif [[ $myarch = arm ]] ; then
- # TODO: re-enable NaCl (NativeClient).
- myconf+=" -Dtarget_arch=arm
- -Darmv7=0
- -Darm_neon=0
- -Ddisable_nacl=1"
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf+=" -Dwerror="
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
- fi
-
- egyp_chromium ${myconf} || die
-}
-
-src_compile() {
- local test_targets
- for x in base cacheinvalidation crypto \
- googleurl gpu media net printing sql; do
- test_targets+=" ${x}_unittests"
- done
-
- local make_targets="chrome chromedriver"
- if ! use selinux; then
- make_targets+=" chrome_sandbox"
- fi
- if use test; then
- make_targets+=$test_targets
- fi
-
- # See bug #410883 for more info about the .host mess.
- emake ${make_targets} BUILDTYPE=Release V=1 \
- CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
- CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
- LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
- AR.host="$(tc-getAR)" || die
-
- pax-mark m out/Release/chrome
- if use test; then
- for x in $test_targets; do
- pax-mark m out/Release/${x}
- done
- fi
-}
-
-src_test() {
- # For more info see bug #350349.
- local mylocale='en_US.utf8'
- if ! locale -a | grep -q "$mylocale"; then
- eerror "${PN} requires ${mylocale} locale for tests"
- eerror "Please read the following guides for more information:"
- eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
- eerror " http://www.gentoo.org/doc/en/utf-8.xml"
- die "locale ${mylocale} is not supported"
- fi
-
- # For more info see bug #370957.
- if [[ $UID -eq 0 ]]; then
- die "Tests must be run as non-root. Please use FEATURES=userpriv."
- fi
-
- runtest() {
- local cmd=$1
- shift
- local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
- einfo "${cmd}" "${filter}"
- LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
- }
-
- local excluded_base_unittests=(
- "ICUStringConversionsTest.*" # bug #350347
- "MessagePumpLibeventTest.*" # bug #398591
- )
- runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-
- runtest out/Release/cacheinvalidation_unittests
- runtest out/Release/crypto_unittests
- runtest out/Release/googleurl_unittests
- runtest out/Release/gpu_unittests
-
- # TODO: re-enable when we get the test data in a separate tarball.
- # runtest out/Release/media_unittests
-
- # local excluded_net_unittests=(
- # "NetUtilTest.IDNToUnicode*" # bug 361885
- # "NetUtilTest.FormatUrl*" # see above
- # "DnsConfigServiceTest.GetSystemConfig" # bug #394883
- # "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
- # "URLFetcher*" # bug #425764
- # "HTTPSOCSPTest.*" # bug #426630
- # "HTTPSEVCRLSetTest.*" # see above
- # "HTTPSCRLSetTest.*" # see above
- #)
- # runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
- runtest out/Release/printing_unittests
- runtest out/Release/sql_unittests
-}
-
-src_install() {
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome || die
-
- if ! use selinux; then
- doexe out/Release/chrome_sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
- fi
-
- doexe out/Release/chromedriver || die
-
- if ! use arm; then
- doexe out/Release/nacl_helper{,_bootstrap} || die
- insinto "${CHROMIUM_HOME}"
- doins out/Release/nacl_irt_*.nexe || die
- doins out/Release/libppGoogleNaClPluginChrome.so || die
- fi
-
- newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
- if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
- sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
- sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
- sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
- -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
- fi
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
- # Allow users to override command-line options, bug #357629.
- dodir /etc/chromium || die
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default" || die
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.pak || die
-
- doins -r out/Release/locales || die
- doins -r out/Release/resources || die
-
- newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
- newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
- doexe out/Release/libffmpegsumo.so || die
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser${CHROMIUM_SUFFIX}.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Chromium${CHROMIUM_SUFFIX}" \
- chromium-browser${CHROMIUM_SUFFIX} \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- if use gnome; then
- dodir /usr/share/gnome-control-center/default-apps || die
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
- if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
- sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
- "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
- fi
- fi
-}
diff --git a/www-client/chromium/chromium-24.0.1312.56.ebuild b/www-client/chromium/chromium-24.0.1312.56.ebuild
index dde19a323b0d..21c06089e86d 100644
--- a/www-client/chromium/chromium-24.0.1312.56.ebuild
+++ b/www-client/chromium/chromium-24.0.1312.56.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/chromium/chromium-24.0.1312.56.ebuild,v 1.3 2013/01/23 10:45:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-24.0.1312.56.ebuild,v 1.4 2013/02/06 03:47:06 floppym Exp $
EAPI="5"
PYTHON_DEPEND="2:2.6"
@@ -27,6 +27,7 @@ RDEPEND="app-arch/bzip2
>=net-print/cups-1.3.11
)
>=dev-lang/v8-3.14.5:=
+ =dev-libs/elfutils-0.149
dev-libs/expat
>=dev-libs/icu-49.1.1-r1
diff --git a/www-client/chromium/chromium-25.0.1364.45.ebuild b/www-client/chromium/chromium-25.0.1364.68.ebuild
similarity index 99%
rename from www-client/chromium/chromium-25.0.1364.45.ebuild
rename to www-client/chromium/chromium-25.0.1364.68.ebuild
index 3f8bf1c1c727..d058e9dbaeaa 100644
--- a/www-client/chromium/chromium-25.0.1364.45.ebuild
+++ b/www-client/chromium/chromium-25.0.1364.68.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/chromium/chromium-25.0.1364.45.ebuild,v 1.1 2013/01/24 03:43:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.68.ebuild,v 1.1 2013/02/06 02:32:42 floppym Exp $
EAPI="5"
PYTHON_DEPEND="2:2.6"
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a0cd055dc8d9..24e66a16fcb0 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_25.0.1364.58-r179520_amd64.deb 39400040 SHA256 691e263778c9ad315e87cb17941d054c5ffe0d468c720744cafcf9a4612ff27e SHA512 de2594a57a48151c3df4742b992eeaa39639c035146775f71e4af994715b1bb76097e0a7d436c35f2f9bba6d00ee7d53887cf671781f82824541d4924a1e0a37 WHIRLPOOL 7e2b03992bc433ed9332db8153f92d079e30654ce4adfce15d6a9f29a974913fe6964f5ad1b046f8d3500e410bec76ed243d115a11049056e47b1c3d6b4c399c
-DIST google-chrome-beta_25.0.1364.58-r179520_i386.deb 37570378 SHA256 ba75c4a3d8bd077e1c10816f0815ac005ca1ce88dbee45ec363507f33d53402f SHA512 38151461112c54516ab2e9231c579a3f39619ff02ad7702a92aed3eecd3a818f993fa2592990b2fede785ad300d60874ac11b2bb4b7e0e262deba6a25dd5b572 WHIRLPOOL 70f7296409ec18b7377659bce014002c50c42bc18c821d40118f5b6ece9277e9a03e38c621e1c4324ca380d3fb952aed53fa754036cc54b3c449e0545a08f96c
+DIST google-chrome-beta_25.0.1364.68-r180609_amd64.deb 39532562 SHA256 1b2aa5485c34676ee9718e93f6f852b1882b4db6a6152b840395031191e95c91 SHA512 8683f48731c80f6bd565a003984d9c870177ac26933beb0180f85b2c9bd8b9896c410ca88b7271e138898e843390359f7c57e003e159e985410556dd9aee2a7e WHIRLPOOL 6d811cfa816bd6826a16b0a6a14172910f027fd208f1b35a33ff9619d9627561ecd7002b8c3bfe244cf58d7fb00ef614551eb71b2705aab1b25bd288252a5824
+DIST google-chrome-beta_25.0.1364.68-r180609_i386.deb 37692028 SHA256 d6d5c061a614f83adf0e1984921657c770e7bc73c5a67753dd36207bcdd154f6 SHA512 cf2b70f5bfbd7318e9b099a7af1044eafb854473c46ab12efacf2793b7be6fa5d7fbb26bb01fcd0eddd6fe1fc4837b845cd62d67df1bce04bb0280bf54852cc0 WHIRLPOOL 1bb6194089b951f8b3096dcf5ea42fad9baa2e2ad5150f4701c820cf94822dfcc7d0579a0676b6298970a4c94fa6dc8f0983cdeff07bcc0c72bd1bfba019d6fe
DIST google-chrome-libudev-0.13.1-amd64.tar.xz 22040 SHA256 e9010b3fc6023c722664a73a62129cdb0cb3c0bc7d86d74de13b4c69eb4470c5 SHA512 f48946a4047cb5ceb148daac22d379c35f2c19fc0ee08c17871a683dd925e34fafee2231e8e4721c97805fb764a23ac76e2ef782ad19efb2af952ba4e3c813fb WHIRLPOOL d37553068b168b64c11120021b544e710f387a3f5e247d7af1c7f892789651aac32b062daa26543d25daebeba887615f713623a6c52e131b747395463a327e1d
DIST google-chrome-libudev-0.13.1-x86.tar.xz 23840 SHA256 abb1ea83b407bd75e9a1e7b5dfce589352a7eda4d15f76647b84ef304d69058a SHA512 6da8d114a33cc693274096d51e989ffcdc2465adfc8f9b4d888704b5f9fad639af91799ee40a94d0a25c9d04e2d70cbd55a0f47e72e4e6b024277e46f027dd28 WHIRLPOOL fa3725df2e9b6e19cd5afc482e833b540a217f364e90113a304c5418cbd3080f5bf8a476966285a18fedae4c3032d0e6f95ddac67c7c72f066c71a9dcdc1090c
DIST google-chrome-stable_24.0.1312.68-r180326_amd64.deb 36748964 SHA256 b13f34c8ffb4de638e9c042e836e23473a45a0f2314e17750acb4ca919d56c90 SHA512 be138bce3b47668c4b2102df1b0f73cac4c878b834249d17a1cfe5fa254f51485907260df80748476e8c7c759f5f8007c107ef30b19c2ba32a553a7276c27f74 WHIRLPOOL 0e16e21cf47e22144cb2f5996fc74cce4f4f4499933741473623efa81a9c1f0642db591619fb951b29433275c11166c62872b9c740daec6ab385991e04418b0c
diff --git a/www-client/google-chrome/google-chrome-25.0.1364.58_beta179520.ebuild b/www-client/google-chrome/google-chrome-25.0.1364.68_beta180609.ebuild
similarity index 97%
rename from www-client/google-chrome/google-chrome-25.0.1364.58_beta179520.ebuild
rename to www-client/google-chrome/google-chrome-25.0.1364.68_beta180609.ebuild
index 972478645406..c0c0eb5cf916 100644
--- a/www-client/google-chrome/google-chrome-25.0.1364.58_beta179520.ebuild
+++ b/www-client/google-chrome/google-chrome-25.0.1364.68_beta180609.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/google-chrome/google-chrome-25.0.1364.58_beta179520.ebuild,v 1.1 2013/01/31 00:25:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-25.0.1364.68_beta180609.ebuild,v 1.1 2013/02/06 01:12:42 floppym Exp $
EAPI="4"
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 21bb81180a82..7b3290435578 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,3 +1,6 @@
DIST opera-next-12.13-1733.i386.freebsd.tar.xz 13525648 SHA256 38fd720e9d1ac5d6e25449362b2e9db60fab3dccb75a082cff440961a4842df2 SHA512 d1dbac052a587832b78ea090a630423a22cc664a17b77d6d1f0308818db22d83af25df39baa174450f5ecfc2d17ad6045e6064c835dc8bf917fae78e12a5a1ce WHIRLPOOL f76a8a83307910a9f9ab470426bfdd41b6b3867c23607483940ecde41e7d3ada8625bb67ffc48c7b4ca996971af260c84573f45c47a55f61278756f80c73be66
DIST opera-next-12.13-1733.i386.linux.tar.xz 13557224 SHA256 b24a4fb6442df63493a819651291a029b2694046ded4f4f2e66e39f9b06e294f SHA512 cd88c63c91b3a038b2a78e6715e42b29d7d71a66d8a3c382bf6f22578fbf1e90d3725c4366ed16c564544a69a3ee7264b99e2b9d9eb0003b8a3bb555283f7a48 WHIRLPOOL a534f7f71c6996d060ae09f886fc06e3210313d82f4f86d884d41933ec55f20336818e2365365be337bf8b949906d368cc2d4cff40ae27f42b5b3c9577f91470
DIST opera-next-12.13-1733.x86_64.linux.tar.xz 13694832 SHA256 536a9b3bae8f825336eb23df9e433f92f2ec21018fadd3c973b1cea5026a7280 SHA512 d93b26d701307eb17ed5f726afaf305e8b52d2912b1894305086d6df3ee9c6af89d3e6dffae96e86fd3c83c406927d212a06845cf8e2b59a1c0ec3226b6cf90c WHIRLPOOL a64525719a94704d71a13966e43c163f44cff1c8bad599ece66a926b77bbefce7320accdbcdb37cd2ca0d24e91193563becc291c68fe6adb24f3333477da0be1
+DIST opera-next-12.14-1737.i386.freebsd.tar.xz 13519432 SHA256 709bc515c1a92002db2fe5c308932d47196311632a2bc1d29584187807f798af SHA512 de9b2cb584981dcfe4742f747a2d774f5ddb25e36a16d3f6d618420f3bf55a2b4e226c484aea1895dad092de6da031dbc95b2b8ce199449d111f7bf21254a49e WHIRLPOOL d4d94031cd24b9e368081a79a508eb54adc44ad74adbcc07a8457ebed491dbaa1e7550989dff3800b5380d8357fc660a92d846ae7907104582837f996af4726d
+DIST opera-next-12.14-1737.i386.linux.tar.xz 13554708 SHA256 cba39bf41c676394f3adeaa61f96ddfed28607366651370f7ab230a8ce6e25c8 SHA512 1fe25d3cf16c787c7c59a8de05097a99aced99b999af08e9890ed9d945f420c4174ea1a17c8619c87ddf156f526bf803c12f82a1e1be500a46c0014276cb53ad WHIRLPOOL 1ac1c239ff51daa56810ce24a0093b419a69301aa7b8cd8f75c65254cc4b2b20ef9adc94bf59463a788be48713b9cf4c4c6c6c1db21c0e87952ce1d8e7b26a30
+DIST opera-next-12.14-1737.x86_64.linux.tar.xz 13679612 SHA256 0e0153158a4836b76e3134b94a53e8141527f3ff86b27c682cb3c48307d041e9 SHA512 981c6480cfc4d548ffe81286024039159d82ade75c6cbc03b4fd01b656e1e7dc11c9ed158ff6d2b326ea19eb4584f136577fc2335ba51771f156bba28c6f7893 WHIRLPOOL a1ab4f5bb3c0482404050946a48474c414779d041a60dc3c53d3860a1c2c7a0d76a093fef1a41bd9b267b94aa03e5db307076d7fe6e13a26d6188f1342239d9c
diff --git a/www-client/opera-next/opera-next-12.14_pre1737.ebuild b/www-client/opera-next/opera-next-12.14_pre1737.ebuild
new file mode 100644
index 000000000000..0a2f1fee5b37
--- /dev/null
+++ b/www-client/opera-next/opera-next-12.14_pre1737.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.14_pre1737.ebuild,v 1.1 2013/02/05 18:09:53 jer Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-12 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+
+O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
+O_B="$(get_version_component_range 3)" # Build number, i.e. 1156
+
+# == Variables that often change ==
+# All other variables should be accounted for by _pre/_p
+
+O_K="BlackOops" # The key to the snapshot URL
+
+O_LINGUAS="
+ af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
+ hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
+ sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+" # Supported linguas
+
+# == End of variables that often change ==
+
+if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
+ O_D="${O_K}_${O_V}-${O_B/pre}" # directory string
+ O_P="${PN}-${O_V}-${O_B/pre}" # package string
+ O_U="http://snapshot.opera.com/unix/" # base URI
+
+ SRC_URI="
+ amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+ x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+ "
+else # release: _p
+ O_D="${O_V/./}" # directory string
+ O_P="${PN}-${O_V}-${O_B/p}" # package string
+ O_U="mirror://opera/" # base URI
+
+ SRC_URI="
+ amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+ x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
+ "
+fi
+
+for O_LINGUA in ${O_LINGUAS}; do
+ IUSE+=" linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+ >=sys-apps/sed-4
+ app-arch/xz-utils
+"
+GTKRDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+ x11-libs/pango
+ x11-libs/pixman
+"
+KDERDEPEND="
+ kde-base/kdelibs
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+"
+GSTRDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-libs/gst-plugins-base:0.10
+ media-libs/gstreamer:0.10
+ media-plugins/gst-plugins-meta:0.10
+"
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ gtk? ( ${GTKRDEPEND} )
+ kde? ( ${KDERDEPEND} )
+ gstreamer? ( ${GSTRDEPEND} )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+QA_PREBUILT="*"
+
+src_unpack() {
+ unpack ${A}
+ mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+ local LNGDIR="share/${PN}/locale"
+
+ # Count linguas
+ count() { echo ${#}; }
+ local lingua_count=$(count ${O_LINGUAS} en)
+ local locale_count=$(count ${LNGDIR}/*)
+ [[ ${lingua_count} = ${locale_count} ]] \
+ || die "Number of LINGUAS does not match number of locales"
+ unset count
+
+ # Remove unwanted linguas
+ for LINGUA in ${O_LINGUAS}; do
+ if ! use linguas_${LINGUA/-/_}; then
+ LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+ rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+ fi
+ done
+
+ # Remove doc directory but keep the LICENSE under another name (bug #315473)
+ mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+ rm -rf share/doc
+ for locale in share/${PN}/locale/*; do
+ rm -f "${locale}/license.txt"
+ ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+ || die
+ done
+
+ # Remove package directory
+ rm -rf share/${PN}/package
+
+ # Optional libraries
+ if ! use gtk; then
+ rm lib/${PN}/liboperagtk2.so || die
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
+ if ! use kde; then
+ rm lib/${PN}/liboperakde4.so || die
+ fi
+ if ! use gstreamer; then
+ rm -r lib/${PN}/gstreamer || die
+ fi
+ if use amd64 && ! use multilib; then
+ rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+ fi
+
+ # Unzip the man pages before sedding
+ gunzip share/man/man1/* || die
+
+ local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+ if [[ ${PN} = opera-next ]]; then
+ OPERA_SUFFIX="-next"
+ OPERA__SUFFIX=" Next"
+ OPERA_USUFFIX="-NEXT"
+ fi
+
+ # Replace PREFIX, SUFFIX and PN in various files
+ sed -i \
+ -e "s:@@{PREFIX}:/usr:g" \
+ -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+ -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+ -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
+ share/man/man1/* \
+ share/mime/packages/* \
+ share/applications/${PN}-*.desktop \
+ || die
+
+ # Create /usr/bin/opera wrapper
+ echo '#!/bin/sh' > ${PN}
+ echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+ echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+ >> ${PN}
+ echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+ # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+ if use elibc_FreeBSD; then
+ scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+ while read i; do
+ if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+ then
+ export SANITY_CHECK_LIBZ_FAILED=1
+ break
+ fi
+ sed -i \
+ "$i" \
+ -e 's/libz\.so\.3/libz.so.1/g'
+ done
+ [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+ fi
+}
+
+src_install() {
+ # We install into usr instead of opt as Opera does not support the latter
+ dodir /usr
+ rm -f lib/opera/opera_autoupdatechecker
+ mv lib/ "${D}/${OPREFIX}" || die
+ mv share/ "${D}/usr/" || die
+
+ # Install startup scripts
+ dobin ${PN}
+
+ # Stop revdep-rebuild from checking opera binaries
+ dodir /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+ > "${D}"/etc/revdep-rebuild/90${PN}
+
+ # Set PaX markings for hardened/PaX (bug #344267)
+ pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use elibc_FreeBSD; then
+ elog
+ elog "To improve shared memory usage please set:"
+ elog "$ sysctl kern.ipc.shm_allow_removed=1"
+ fi
+
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 7dcb062302e2..2d7bf45bc124 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,6 +1,6 @@
DIST opera-12.13-1734.i386.freebsd.tar.xz 13517848 SHA256 71c3c2adee33917e165fd80ea4df71960da8e680f117ecdf3bff54fca2bce19a SHA512 f345d542d87a1547a82f47a0452ace8a8458b2ba33a17575296f6bef800b524c0ddc005113e5ec1164906293a47121e3fceb56fe047a1c305e946e18f079c24f WHIRLPOOL 53960e5b70d41f8a16d0407e709ebd4c04c61a14e8236ab51edfa7e6662d819338e714cfbfa88e857d6a6afaf24e5d9ed4af2feab259157c38050d41a0fbff56
DIST opera-12.13-1734.i386.linux.tar.xz 13561780 SHA256 8f5d825ad95122c79bb612fa252732f59fd9f97417d976f9503753dda37ef1b4 SHA512 6f705efd7b74ba4c365452637138d930966d36d80230d6a280c0619745e404910a24b0e6f6ced9ee052fbb532044cae32ee226e29accbe62823773cac9693369 WHIRLPOOL ccacdb2009d2419d363c1d8515a1654762c9bc8e2a8056b7d60e4bf8cf97a07606673501c7ca76082dfb844abf7852fd7d61d4f46e55992bf3542089beca600c
DIST opera-12.13-1734.x86_64.linux.tar.xz 13697376 SHA256 d980e7e2a362d89c712022b1a1e2822bf4fcc16d7858c1b9111c2d579ef9c2c9 SHA512 f259cde1ba82775ee5ceaaabe569dc6a45fd26ee5d9fb6d4cfe240d472103757a370d6d21294526735993f694aa2714e5daa0f3f18e719453b50395fc28da389 WHIRLPOOL b5fd239b47bc7551ae3b17218bc6a708b6f2756282ace1e1a64e463cffd3cb9c842f2982d6dafdb1d29944c6ba9c23e66ebede7c29e1372b00a5166456958a46
-DIST opera-12.14-1737.i386.freebsd.tar.xz 13517800 SHA256 bc302adee7f7013927d492912a7b11f54c7d7527c2184a388bb5c30628913f4e SHA512 c8e83372b08ae8eccbb2602b8f902a6409faf69beb4c66e4eaf9232ac89a8f2ec700b08ff817e8656bcc3509e451a77fed73e4ed41fb13dd426a9758471cf76c WHIRLPOOL 2f3bad401743f5221af318d1bb936b73947661b38390c5cceef12fd7f69c501280f460a83226900405b17e64fe410b6aa5c785849847f1a02d2ef37232aea7c2
-DIST opera-12.14-1737.i386.linux.tar.xz 13559008 SHA256 c3bf538c18a900f4af32140f63846e1ed5c6108101791ce6d9e605a4763e9a41 SHA512 549a5b763fa790d6a342e51be367f8511e0edc67e79785ab43a74bb24b75f056f2e3091095cc327a52a300681477dc578c87113853b08a46f249fa38b95e3e23 WHIRLPOOL 5a26e505e139a7ab515b3a791e75d71077a1b2e2dce7f544cb5d75fa4f2a0b23348095c227be5634a73cb6e518cae9828954746524ac1d6e04f747db7f6c15e2
-DIST opera-12.14-1737.x86_64.linux.tar.xz 13674008 SHA256 fc6d7e6ba3a1ef47721cd7bfd6b201f72d319388ab6fae363dd54c8cd3bd6fb2 SHA512 77f3bb900d77f59ebd8bb0e860216f3472b9f10c5a5469a9b388ca0aeb93d33278f1b6204beb80cf42a81531f64e57ef66591cf565181b145881d0bd92660358 WHIRLPOOL 02e579cb493683fd54453640f1d2a5667ec2c95d0e1f9790d208ffd1175501c47e41360b142e411c3ea970b9676b70c440b183439ea5d931393e464dd9e7aabe
+DIST opera-12.14-1738.i386.freebsd.tar.xz 13488412 SHA256 8c706c578ed6151a22ba30a1311e8aa51cd789851f962eab76df9d7c22db9d5a SHA512 48d35d35be1c5f55e9176b0632f268642b4cdcfc9fdcec7777d0048b7233c9c94b646b18be4ed09679f6543ed32c591451af7b184f936b7ac8726e9860268d1d WHIRLPOOL d36967b6d909d84ddc5c2579be47ccd9a2358c0d2f86f8afeb2449b7ac541b9a6d1927b25319367ca61781d1dcd20e455b4a4c6afa0b72717330a405cb3bc5ee
+DIST opera-12.14-1738.i386.linux.tar.xz 13590832 SHA256 00721be8475bd967ff0017d3db6c57d9d03b329bdcab2fba44231afccb0b9bd9 SHA512 5f32cdb6ac87e004dcebe820aa818257b7dc0b1f79282268f2bd3db0ab6e02454e9a1d37de2b36413947de3ae86199c190e5233115371a949baf7eca6c0faaee WHIRLPOOL cfcbbfa493b657a4522a1300acc44eb7edd44656f6431ad6ec0e2d1e74b1d84e3a4557603ed722c82ce124cc5aca778ff211678504672c829097e6435a8be838
+DIST opera-12.14-1738.x86_64.linux.tar.xz 13680464 SHA256 d38c2a7ae40ba3b0ba9829409167c71ba1f2125b88fcddaceda9aca6416d206e SHA512 f27c65b00be7d72c40910e17ba1bbee95f6953b2be3bcbfd2a3eb5bd0ba0df7b943c66826d0ade2e642f8a4056f26fc0fd6c0b952574cc5d7ed7e97a8e2dbbc2 WHIRLPOOL 0f052377d273d8f408215b3e4ad4d70a7d8fe7f94d44033752ac68ad0e2fda4c000aa15c669202e8990f66ed2ea353ca50579fa67942769a6eda3d522e73e1a2
diff --git a/www-client/opera/opera-12.14_pre1737.ebuild b/www-client/opera/opera-12.14_p1738.ebuild
similarity index 99%
rename from www-client/opera/opera-12.14_pre1737.ebuild
rename to www-client/opera/opera-12.14_p1738.ebuild
index 723dcd7400dc..c93eb8d0aebb 100644
--- a/www-client/opera/opera-12.14_pre1737.ebuild
+++ b/www-client/opera/opera-12.14_p1738.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/opera/opera-12.14_pre1737.ebuild,v 1.1 2013/02/04 19:59:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.14_p1738.ebuild,v 1.1 2013/02/05 17:59:52 jer Exp $
EAPI=4
inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild
new file mode 100644
index 000000000000..67431e6ed779
--- /dev/null
+++ b/www-servers/tornado/tornado-2.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.1 2013/02/05 23:14:49 mgorny Exp $
+
+EAPI=5
+
+#
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl"
+
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep python2*)] )
+ python_targets_python2_5? (
+ dev-python/simplejson[python_targets_python2_5] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="curl? ( $(python_gen_useflags python2*) )"
+
+src_test() {
+ # The test server tries to bind at an unused port but suffers
+ # a race condition in it. Seems to be fixed already.
+ # https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ cd "${TMPDIR}" || die
+ "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index c00593e72f31..f176bb00aae5 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,2 +1 @@
-DIST xbacklight-1.1.2.tar.bz2 102939 SHA256 af2f02d09de8a19848e3f3b322320141bceebf9d4097b7bd505457a1bd936509 SHA512 d2703850061fe79f7130100cdac50a83da0c1437d3adb0278e26e6ad09d698748b6eb32dc3350582e9cae3e9fb70000c7ac696b823fcac00e7ef1220a3617a1c WHIRLPOOL c606ea9a066d71a51fe86f2a847244dfb60a25d32d209199c70cf2e12ad382510fe2e6cb55305c3d826face782ef277e61fdde608a2b72007bb19004ea9869f9
DIST xbacklight-1.2.0.tar.bz2 115448 SHA256 5152d6134fa592c9c14060d7324a7db104da0184cc9b2f9715e847f9354e36a5 SHA512 525ce78c150fbe60cf4768a3dfeb0a1253c48f589c95f6be1465879b25e61e6fa515983684c03c3aba700fcfc6f589b708e59491c00ee0153ba0b8e0f61b77d2 WHIRLPOOL 5937b332c9e15c433d1d1c9656598c373333ce755052d0c31f3edcdca3adb92dd6926389dee71be75948c380dd20d7d18cc60ed51af6df8b7521f1ae1e7094fb
diff --git a/x11-apps/xbacklight/xbacklight-1.1.2.ebuild b/x11-apps/xbacklight/xbacklight-1.1.2.ebuild
deleted file mode 100644
index dd4beca4e106..000000000000
--- a/x11-apps/xbacklight/xbacklight-1.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbacklight/xbacklight-1.1.2.ebuild,v 1.8 2012/05/15 14:12:26 aballier Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrandr-1.2
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a038f44fce20..52a8150af9c8 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,3 +1,4 @@
DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 SHA512 8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a WHIRLPOOL 8ee0e6f2f520a8e5e046a311926f07a49dd7b730b66b49684ce0ea296b9b5822a80a194b8eff56c73d92da850faa15fed925a1df41b3ea28e3841530548d4ef5
DIST cairo-1.12.10.tar.xz 42135592 SHA256 f1581aef210f6caa9cf42875fb66ab3b47a32db9436bdfa9913b9bbd5034b03b SHA512 e56bd3973039bc0dd48fb9e89b17a58e8061fce2628403e2c1256209cf66ef1b50af1c9a28c4a75806066416475515b75f76de845e2e6735fb273e6ddda3a160 WHIRLPOOL dbce51bbe1732076b770cc6928caac007eb0e69bcb392ac9c82d17a203defcbb732d7bf8d8b020c3d04937d4a5df757600f1bedc51ea3d88cd41f6c44aeedf0b
+DIST cairo-1.12.12.tar.xz 42139096 SHA256 14f693759ecc87472355ae8f0c34731a8578b408b607cfd0b5d34331ff05d81a SHA512 bde93913895116b80d857b965e34af969bee42d30d3e2d94edc6bc9af93ebb8f1124328a280f9d1b955d811e671e9d339e990669f30d5d861145b6bcc86e3f86 WHIRLPOOL ec4f0727c928fa4bd4fb75fd6183bbb4d32e78385400284adf95389d278fa79ee812cc08bf07efe95313a6d265871c3c9569fb509f0b973468dc770ca89ed65a
DIST cairo-1.12.8.tar.xz 42113752 SHA256 8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9 SHA512 f6f6079ccae8353fa43a2af66b655516b33d6d94329c968795b727d049ac94a5e000b148d9318a294576df1d992e48eb17c2d37301461bd15d8c2e2fb042f41f WHIRLPOOL 9502505327000e5241e46256da6b92d7a6204a03baebecf963a92ca7bbf88cba7e998fa114a9f2003ee7a602bcd65f79a0967f9cc486d06d61d160a5748b52cd
diff --git a/x11-libs/cairo/cairo-1.12.12.ebuild b/x11-libs/cairo/cairo-1.12.12.ebuild
new file mode 100644
index 000000000000..7c337ea4ea3a
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.12.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.12.ebuild,v 1.1 2013/02/06 00:22:32 mattst88 Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libpng:0
+ sys-libs/zlib
+ >=x11-libs/pixman-0.28.0
+ directfb? ( dev-libs/DirectFB )
+ glib? ( >=dev-libs/glib-2.28.6:2 )
+ opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+ openvg? ( media-libs/mesa[openvg] )
+ qt4? ( >=x11-libs/qt-gui-4.8:4 )
+ X? (
+ >=x11-libs/libXrender-0.6
+ x11-libs/libXext
+ x11-libs/libX11
+ drm? (
+ >=virtual/udev-136
+ gallium? ( media-libs/mesa[gallium] )
+ )
+ )
+ xcb? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ doc? (
+ >=dev-util/gtk-doc-1.6
+ ~app-text/docbook-xml-dtd-4.2
+ )
+ X? (
+ x11-proto/renderproto
+ drm? (
+ x11-proto/xproto
+ >=x11-proto/xextproto-7.1
+ )
+ )"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+ drm? ( X )
+ gallium? ( drm )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+ use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+ epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
+ epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+ epatch "${FILESDIR}"/${P}-disable-test-suite.patch
+ epatch_user
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ # We need to run elibtoolize to ensure correct so versioning on FreeBSD
+ # upgraded to an eautoreconf for the above interix patch.
+ eautoreconf
+}
+
+src_configure() {
+ local myopts
+
+ # SuperH doesn't have native atomics yet
+ use sh && myopts+=" --disable-atomic"
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+ # http://bugs.freedesktop.org/show_bug.cgi?id=15463
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
+
+ #gets rid of fbmmx.c inlining warnings
+ append-flags -finline-limit=1200
+
+ use X && myopts+=" --enable-tee=yes"
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # --disable-xcb-lib:
+ # do not override good xlib backed by hardforcing rendering over xcb
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable directfb) \
+ $(use_enable glib gobject) \
+ $(use_enable doc gtk-doc) \
+ $(use_enable openvg vg) \
+ $(use_enable opengl gl) \
+ $(use_enable qt4 qt) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ $(use_enable drm) \
+ $(use_enable gallium) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --disable-xlib-xcb \
+ ${myopts}
+}
+
+src_install() {
+ # parallel make install fails
+ emake -j1 DESTDIR="${D}" install
+ find "${ED}" -name '*.la' -exec rm -f {} +
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch
new file mode 100644
index 000000000000..37033d7f1617
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.12-disable-test-suite.patch
@@ -0,0 +1,12 @@
+diff -ruN cairo-1.12.10.orig/test/Makefile.am cairo-1.12.10/test/Makefile.am
+--- cairo-1.12.10.orig/test/Makefile.am 2013-01-27 14:56:03.345178612 -0800
++++ cairo-1.12.10/test/Makefile.am 2013-01-27 14:56:15.371177856 -0800
+@@ -71,8 +71,6 @@
+ endif
+ test_sources += $(test)
+
+-noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
+-
+ TESTS += cairo-test-suite$(EXEEXT)
+
+ cairo-test-constructors.c: Makefile $(test_sources) make-cairo-test-constructors.sh
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ae8ae84cb472..91ef71bd25dc 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,3 +1,4 @@
DIST libdrm-2.4.20.tar.bz2 400812 SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9 SHA512 fa7a042a80b71057b7d15a36c7902e1882abb23dea77cabfa2e78590d9477d8e0259364f0e2eb6005b316254be2c728e295c114b1fe365074438539bc3dd9392 WHIRLPOOL 92a9fba9f64d0c988e8e6bcbdd1798583a420bc1287b4e85c1ca9a84c5fd3c95e5079dc111eee89811038832a5a90139780292d43554257465c99726b7f27661
DIST libdrm-2.4.33.tar.bz2 446817 SHA256 2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea SHA512 ac355bab87c87b8540218401f89ad16ece0e6fdd28d937e41e8a4765d7f9792798f7e74d27f3b57c49d1d8dd3909d6668e10b0139b1c35bbab5ab9002ff64c1e WHIRLPOOL 5ebeb22ef22f8fceba628768725bbfe54316f7dcf41ea2b454ba5a504aae65bb3e918269fffadd8a13975e79eeecf50274f2ffa24d6ef42a13e7e3874a5b9bf4
DIST libdrm-2.4.40.tar.bz2 492962 SHA256 48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f SHA512 48629dd72623ff98468a991770ef90209b6f82826b94ae70fe591969e8d1efaa0431cb4b48a011e376368e16bdb3da1be82e90e95c765956aeeed7fc77819dfa WHIRLPOOL b103a7c33e3e5ea1b80a73a6d74de8b68eead898669624ecc6806110dba2f0c5871747e03fad9b5af6de47cddda1308e08d1e26644cf216e6ca8bdf1989f5d28
+DIST libdrm-2.4.42.tar.bz2 500327 SHA256 e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1 SHA512 c6c57ff947ca8d5c9e74473538e22f42502c0ba78053545e4801610359e3fa5e1e5a9e028e16f0ef62a42aa7281d30ae1a54994bc4bc82681198e38b14b01a49 WHIRLPOOL 4f92d6e683da61a53bf099b93edbb51e8994a8d55c4a9bb93dd0fd7bf46ce5e0a83bea9bba32fe0d436e0986b2955e3bf757436ca36e0260844d988990d4d1b2
diff --git a/x11-libs/libdrm/libdrm-2.4.42.ebuild b/x11-libs/libdrm/libdrm-2.4.42.ebuild
new file mode 100644
index 000000000000..ca1e1c975e84
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.42.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.42.ebuild,v 1.1 2013/02/05 15:46:00 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index bce21d2e4acf..961f8ec60ae9 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,3 +1,4 @@
DIST gtkdialog-0.7.20.tar.gz 280408 SHA256 dc2be3f49438bc8cd70d5e2a8ec43bec189e25ba8b43340e019358e73f419b5b
DIST gtkdialog-0.8.0.tar.gz 413994 SHA256 1c4ce72a0428f726fed42b45f87317695bfee8d2064eeea664b2a0731a7e8100 SHA512 b098b63e5255c721258f6206aee361ff204875178b013c8873880ab81dd8a59469a2d211603d97e497b0f18d32663ef0e7ee1a99946511bdd8ce413a3d834cf7 WHIRLPOOL f4616ea06f9f721a21a7ed6613cc484948a05e49adb0e13e73d733531e2e2908e27f89c9445a994981c6a0db8631a2744d63b66f57f2fb0c196a78a48e0e2d08
DIST gtkdialog-0.8.2.tar.gz 494083 SHA256 02a75a331d712b0756abb3f1715b7016398f1831917a1798ce747d7131a30fb5 SHA512 15eb99a2a0b3983fc99658afe6e0a97fbeaf2e533a93974d5961da052e87c0aa3a7b6ac4445deff0e54e22a260568b125fd563784352af058328c4a3dbace6fe WHIRLPOOL 04de9c2434ff87b2b7c26f5447db765e3c02ad60b07a15e946853d41db2b981f3a6c1a123bb91472317414eeb3416e52db02faa869f0d5c02f8917877518f562
+DIST gtkdialog-0.8.3.tar.gz 571974 SHA256 ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7 WHIRLPOOL 51ca225b8c47de8f5fdaf1937d44450670d77cb913c677fa48dafce9e1365fb8a45f353b9ab9f86a3da96155a3d27f1dd011e98ae74eac506069bd72ae484867
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
new file mode 100644
index 000000000000..7edf509c77e4
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild,v 1.1 2013/02/06 03:29:15 jer Exp $
+
+EAPI=4
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="http://code.google.com/p/gtkdialog/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ gnome-base/libglade"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ virtual/yacc"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_install() {
+ # Stop make install from running gtk-update-icon-cache
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 7652443fd350..0e8a15ea4325 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1 @@
-DIST VirtualGL-2.3.1.tar.gz 2736264 SHA256 30e101111eb82a1c3326c7581ccc6ad7f3cdf827b22ef4510e62a700071155c9 SHA512 4e9e75e46e458358969f93edeee0f12f962ce1050255808d6ab4ad7aec6ab26c3e63a7f4d9b5abcfda35df1fb8757b4d6708fcc681d03af9f9041f97cccfd479 WHIRLPOOL cfae31c9334ededae01de2dc3e7a74e104c260431643f890c5b658b3fc05e5ccc6c42be9f228cca5ee4d8ff8ee3d96c0a50822d8a593043b15b5dd0302a6036c
DIST VirtualGL-2.3.2.tar.gz 2741077 SHA256 bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418 SHA512 69cf5082a33d86a3778c147de6296366efd056a8be9d38c3dc41030e832c58025fc2ee535076ae2a66a3ed8ee817109068c9255f9c1e0b9c5ff983450223b53d WHIRLPOOL c0f1fe6629b0020322e7a165025d704091cd6dd88e5ca11037cddf14cdcccf5b50bc7a8b081d5f1d7508369a7d4f55d88aad3b783760ca32daeef1b244c3793e
diff --git a/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild
deleted file mode 100644
index 7b67bb106337..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild,v 1.2 2012/12/03 11:58:07 mgorny Exp $
-
-EAPI="4"
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )
- media-libs/libjpeg-turbo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs )
- virtual/opengl"
-DEPEND="${RDEPEND}"
-
-CMAKE_VERBOSE=1
-build32_dir="${WORKDIR}/${P}_build32"
-
-src_prepare() {
- # Use /var/lib, bug #428122
- sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
- server/vglrun server/vglgenkey server/vglserver_config || die
-
- default
-}
-
-src_configure() {
- # Configure 32bit version on multilib
- use amd64 && use multilib && (
- einfo "Configuring 32bit libs..."
-
- local ABI=x86
- local CFLAGS="${CFLAGS--O2 -march=native -pipe} -m32"
- local CXXFLAGS="${CFLAGS}"
- local LDFLAGS="${LDFLAGS} -m32"
- local BUILD_DIR="${build32_dir}"
-
- mycmakeargs=(
- $(cmake-utils_use ssl VGL_USESSL)
- -DVGL_DOCDIR=/usr/share/doc/"${P}"
- -DVGL_LIBDIR=/usr/$(get_libdir)
- -DTJPEG_INCLUDE_DIR=/usr/include
- -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/lib32
- -DVGL_FAKELIBDIR=/usr/fakelib/32
- )
- cmake-utils_src_configure
-
- einfo "Configuring 64bit libs..."
- )
-
- # Configure native version
- mycmakeargs=(
- $(cmake-utils_use ssl VGL_USESSL)
- -DVGL_DOCDIR=/usr/share/doc/"${P}"
- -DVGL_LIBDIR=/usr/$(get_libdir)
- -DTJPEG_INCLUDE_DIR=/usr/include
- -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/lib64
- -DVGL_FAKELIBDIR=/usr/fakelib/64
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- # Make 32bit version on multilib
- use amd64 && use multilib && (
- einfo "Building 32bit libs..."
- local BUILD_DIR="${build32_dir}"
- cmake-utils_src_compile
-
- einfo "Building 64bit libs..."
- )
-
- # Make native version
- cmake-utils_src_compile
-}
-
-src_install() {
- # Install 32bit version on multilib
- use amd64 && use multilib && (
- einfo "Installing 32bit libs..."
- local BUILD_DIR="${build32_dir}"
- cmake-utils_src_install
-
- einfo "Installing 64bit libs..."
- )
-
- # Install native version
- cmake-utils_src_install
-
- # Make config dir
- dodir /var/lib/VirtualGL
- fowners root:video /var/lib/VirtualGL
- fperms 0750 /var/lib/VirtualGL
- newinitd "${FILESDIR}/vgl.initd-r1" vgl
- newconfd "${FILESDIR}/vgl.confd-r1" vgl
-
- # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
- mv "${D}"/usr/bin/{,v}glxinfo || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
index 8b3acef396de..bd3d56516a94 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.2.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/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.2 2012/12/03 11:58:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.3 2013/02/05 17:38:27 pacho Exp $
EAPI="4"
inherit cmake-utils multilib
@@ -23,7 +23,9 @@ RDEPEND="ssl? ( dev-libs/openssl )
x11-libs/libX11
x11-libs/libXext
x11-libs/libXv
- multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs )
+ multilib? ( app-emulation/emul-linux-x86-xlibs
+ app-emulation/emul-linux-x86-baselibs
+ app-emulation/emul-linux-x86-opengl )
virtual/glu
virtual/opengl"
DEPEND="${RDEPEND}"
diff --git a/x11-plugins/vicious/vicious-2.1.0-r1.ebuild b/x11-plugins/vicious/vicious-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..1c0a0fc0f0ba
--- /dev/null
+++ b/x11-plugins/vicious/vicious-2.1.0-r1.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/x11-plugins/vicious/vicious-2.1.0-r1.ebuild,v 1.1 2013/02/05 23:25:49 wired Exp $
+
+EAPI=5
+
+DESCRIPTION="Modular widget library for x11-wm/awesome"
+HOMEPAGE="http://awesome.naquadah.org/wiki/Vicious"
+SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib"
+
+DEPEND=""
+RDEPEND="x11-wm/awesome"
+
+src_install() {
+ insinto /usr/share/awesome/lib/vicious
+ doins -r widgets helpers.lua init.lua
+ dodoc CHANGES README TODO
+
+ if use contrib; then
+ insinto /usr/share/awesome/lib/vicious/contrib
+ doins contrib/*.lua
+ newdoc contrib/README README.contrib
+ fi
+}
diff --git a/x11-wm/awesome/awesome-3.5.ebuild b/x11-wm/awesome/awesome-3.5-r1.ebuild
similarity index 66%
rename from x11-wm/awesome/awesome-3.5.ebuild
rename to x11-wm/awesome/awesome-3.5-r1.ebuild
index f6c21097ec8b..09967ab5303e 100644
--- a/x11-wm/awesome/awesome-3.5.ebuild
+++ b/x11-wm/awesome/awesome-3.5-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/x11-wm/awesome/awesome-3.5.ebuild,v 1.1 2013/01/04 03:52:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5-r1.ebuild,v 1.1 2013/02/05 23:02:52 wired Exp $
EAPI="5"
CMAKE_MIN_VERSION="2.8"
@@ -15,19 +15,21 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="dbus doc elibc_FreeBSD gnome"
-COMMON_DEPEND=">=dev-lang/lua-5.1
+COMMON_DEPEND="
+ >=dev-lang/lua-5.1
+ dev-libs/glib:2
>=dev-libs/libxdg-basedir-1
+ >=dev-lua/lgi-0.6.1
x11-libs/cairo[xcb]
- || ( =x11-libs/libX11-1.3.99.901 )
+ x11-libs/gdk-pixbuf:2
>=x11-libs/libxcb-1.6
+ >=x11-libs/pango-1.19.3[introspection]
>=x11-libs/startup-notification-0.10_p20110426
>=x11-libs/xcb-util-0.3.8
x11-libs/libXcursor
- x11-libs/gdk-pixbuf:2
- dev-libs/glib:2
+ || ( =x11-libs/libX11-1.3.99.901 )
dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- >=dev-lua/lgi-0.6.1"
+ elibc_FreeBSD? ( dev-libs/libexecinfo )"
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
DEPEND="${COMMON_DEPEND}
@@ -40,43 +42,15 @@ DEPEND="${COMMON_DEPEND}
>=x11-proto/xproto-7.0.15
doc? (
app-doc/doxygen
- dev-lua/luadoc
media-gfx/graphviz
)"
-RDEPEND="${COMMON_DEPEND}
- || (
- x11-misc/gxmessage
- x11-apps/xmessage
- )"
-
-# bug #321433: Need one of these to for awsetbg.
-# imagemagick provides 'display' and is further down the default list, but
-# listed here for completeness. 'display' however is only usable with
-# x11-apps/xwininfo also present.
-RDEPEND="${RDEPEND}
- || (
- ( x11-apps/xwininfo
- || ( media-gfx/imagemagick[X] media-gfx/graphicsmagick[imagemagick,X] )
- )
- x11-misc/habak
- media-gfx/feh
- x11-misc/hsetroot
- media-gfx/qiv
- media-gfx/xv
- x11-misc/xsri
- media-gfx/xli
- x11-apps/xsetroot
- )"
+RDEPEND="${COMMON_DEPEND}"
DOCS="AUTHORS BUGS PATCHES README STYLE"
src_prepare() {
- # Upstreamed
- #epatch \
- # "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
- # bug #408025
+ # bug #408025
epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
}
@@ -85,12 +59,9 @@ src_configure() {
-DPREFIX="${EPREFIX}"/usr
-DSYSCONFDIR="${EPREFIX}"/etc
$(cmake-utils_use_with dbus DBUS)
+ $(cmake-utils_use doc GENERATE_DOC)
)
- # The lua docs now officially require ldoc.lua and NOT luadoc
- # As the modules documentation has been updated to the Lua 5.2 style
- has_version >=dev-lang/lua-5.2 && mycmakeargs+="$(cmake-utils_use doc GENERATE_DOC)"
-
cmake-utils_src_configure
}
@@ -131,3 +102,27 @@ src_install() {
doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
fi
}
+
+pkg_postinst() {
+ # bug #447308
+ if use gnome; then
+ elog
+ elog "You have enabled the gnome USE flag."
+ elog "Please note that quitting awesome won't kill your gnome session."
+ elog "To really quit the session, you should bind your quit key"
+ elog "to the following command:"
+ elog " gnome-session-quit --logout"
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
+ fi
+
+ # bug #440724
+ elog
+ elog "If you are having issues with Java application windows being"
+ elog "completely blank, try installing"
+ elog " x11-misc/wmname"
+ elog "and setting the WM name to LG3D."
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
+ elog
+}