Sync with portage [Sun Sep 23 13:16:08 MSK 2012].

12 years ago · 3a8520b89d
parent a85245db89
commit 3a8520b89d
482 changed files with 4917 additions and 6316 deletions
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@ -1,2 +1,3 @@
+DIST abrt-2.0.12.tar.gz 1090121 SHA256 2957f4136958078c3c8c9b2031febd8b322ef8705ca25a51592279b3ccd5c9e2 SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a WHIRLPOOL 9b39fe91f77e2de5b3816d5cfc10f75c7c3d7dedfc354ed4e052b50e6cebb94bd26fec94aaba6cfd1cc79b71f1cc34b77bfd70d27d25761fa853a6a2af5ef7ce
 DIST abrt-2.0.6.tar.gz 996676 SHA256 0413a6b6143d0e667bb9c2c34a8ddfdb82d0dff04050acd254eb86943dd181a1 SHA512 3a4715c18fe04fb7f4b6dc921b08380795a55628926b7cfb7b33750db3dfb9d8c0ce6c975edc945c2c8f030ae1095ebef5397e9ccbedeb34a08a1798d462c07c WHIRLPOOL a5d1b231502f860a12a06f302889786349bd3e1ec84651d33443eb8214977e7cc943d6140865c17aef2a76a61a66e4cbb052e17acb1db053a506a2d8183bc57d
 DIST abrt-2.0.8.tar.gz 960737 SHA256 aaad9f6914e40bda8783ff10e34f62a9712bfebda06373a7c056e3ca8bad4e5b SHA512 3b4dbb09309a45d3596c6d890f103e95aff12a4246bcea1dc5ae558869ff138c87559f0362534156a5d628a642e43621a5147a6eeaa5abbb3d3b5299d42ced17 WHIRLPOOL 51f82e8913708c7398889ccff0e2a0d41fe9e037c20a32547bae7f859ff2e04004f399fd5f118b20c14dc4438d7bd56fa6fc6318ad99f474f218dd6e5bb0d32c
--- a/app-admin/abrt/abrt-2.0.12.ebuild
+++ b/app-admin/abrt/abrt-2.0.12.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.12.ebuild,v 1.1 2012/09/22 20:12:52 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+# Need gnome2-utils for gnome2_icon_cache_update
+inherit autotools eutils gnome2-utils python systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/btparser-0.18
+	>=dev-libs/glib-2.21:2
+	>=dev-libs/libreport-2.0.11
+	dev-libs/libxml2
+	dev-libs/nss
+	sys-apps/dbus
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	>=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Disable redhat-specific code not usable in gentoo, or that requires
+	# bugs.gentoo.org infra support.
+	epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
+
+	# Using a server response as a format string is a bad idea
+	epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
+
+	# automake-1.12, #427926
+	epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
+
+	# Fix dbus timeout in gui; in next release
+	epatch "${FILESDIR}/${P}-dbus-fallback.patch"
+
+	eautoreconf
+
+	python_clean_py-compile_files
+	python_convert_shebangs -r 2 src
+}
+
+src_configure() {
+	myeconfargs=( "--localstatedir=${EPREFIX}/var" )
+	# --disable-debug enables debug!
+	use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
+	systemd_to_myeconfargs
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.5-conf" abrt
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	python_mod_optimize abrt_exception_handler.py
+	elog "To start the bug detection service on an openrc-based system, do"
+	elog "# /etc/init.d/abrt start"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	python_mod_cleanup abrt_exception_handler.py
+}
--- a/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
+++ b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
@ -0,0 +1,64 @@
+From 00704d4eb30dd12d6f4fcf97320c354ed3eacfa7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:50:38 -0400
+Subject: [PATCH] Fix automake-1.12 autoreconf issues
+
+Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am and
+':='-style assignments and $(wildcard *~) in src/hooks/Makefile.am.
+
+Need AM_PROG_CC_C_O for src/applet/applet.c
+
+gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
+problems for automake-1.12.
+---
+ configure.ac           | 8 +++-----
+ src/daemon/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a78d9f8..42acccf 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([abrt],
+ 	[crash-catcher@fedorahosted.org])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to ./configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+@@ -12,8 +12,9 @@ AM_SILENT_RULES([yes])
+ 
+ 
+ AC_DISABLE_STATIC
+AM_PROG_AR
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+AM_PROG_CC_C_O
+ AC_PROG_LN_S
+ 
+ AC_SYS_LARGEFILE
+@@ -30,9 +31,6 @@ GETTEXT_PACKAGE=abrt
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ dnl ****** END ****************************************
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 777dfc4..5a5f0ea 100644
+--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
+@@ -63,4 +63,4 @@ EXTRA_DIST = abrt-handle-upload
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ 
+ install-data-local:
+-	$(mkdir_p) '$(DESTDIR)/$(VAR_RUN)'
+	$(MKDIR_P) '$(DESTDIR)/$(VAR_RUN)'
+-- 
+1.7.12
+
--- a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
+++ b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
@ -0,0 +1,111 @@
+From 3ddf2f38a47c7cc13dd6f480841b9b90f6304ed4 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 3 Sep 2012 19:01:24 +0200
+Subject: [PATCH] abrt-gui: fall back to direct access if dbus access fails.
+ Closes #484
+
+It looks like this:
+
+root> abrt-gui
+Can't connect to system DBus: Error connecting: No such file or directory
+Error in DBus communication, falling back to direct access to '/var/spool/abrt'
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ src/gui-gtk/main.c    | 44 +++++++++++++++++++++++++++-----------------
+ src/lib/problem_api.c |  5 +++--
+ 2 files changed, 30 insertions(+), 19 deletions(-)
+
+diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
+index 2cc4bef..e6e8ef0 100644
+--- a/src/gui-gtk/main.c
+++ b/src/gui-gtk/main.c
+@@ -252,23 +252,6 @@ static void add_directory_to_dirlist(const char *problem_dir_path, gpointer data
+     VERB1 log("added: %s", problem_dir_path);
+ }
+ 
+-static void query_dbus_and_add_to_dirlist(void)
+-{
+-    GList *problem_dirs = get_problems_over_dbus(g_authorize);
+-
+-    if (problem_dirs)
+-    {
+-        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
+-        list_free_with_free(problem_dirs);
+-    }
+-
+-    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
+-     * live in g_settings_dump_location.
+-     * Notifications on changes should be implemented to go over dbus too.
+-     */
+-    watch_this_dir(g_settings_dump_location);
+-}
+-
+ static void scan_directory_and_add_to_dirlist(const char *path)
+ {
+     DIR *dp = opendir(path);
+@@ -296,6 +279,33 @@ static void scan_directory_and_add_to_dirlist(const char *path)
+     watch_this_dir(path);
+ }
+ 
+static void query_dbus_and_add_to_dirlist(void)
+{
+    GList *problem_dirs = get_problems_over_dbus(g_authorize);
+
+    if (problem_dirs == ERR_PTR)
+    {
+        /* One way to trigger this is to temporarily rename
+         * dbus socket (/var/run/dbus/system_bus_socket)
+         */
+        error_msg("Error in DBus communication, falling back to direct access to '%s'", g_settings_dump_location);
+        scan_directory_and_add_to_dirlist(g_settings_dump_location);
+        return;
+    }
+
+    if (problem_dirs)
+    {
+        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
+        list_free_with_free(problem_dirs);
+    }
+
+    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
+     * live in g_settings_dump_location.
+     * Notifications on changes should be implemented to go over dbus too.
+     */
+    watch_this_dir(g_settings_dump_location);
+}
+
+ static void scan_dirs_and_add_to_dirlist(void)
+ {
+     if (!(g_opts & OPT_D))
+diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c
+index b9967e8..04f4069 100644
+--- a/src/lib/problem_api.c
+++ b/src/lib/problem_api.c
+@@ -144,7 +144,7 @@ GList *get_problems_over_dbus(bool authorize)
+ {
+     GDBusProxy *proxy = get_dbus_proxy();
+     if (!proxy)
+-        return NULL;
+        return ERR_PTR;
+ 
+     GError *error = NULL;
+     GVariant *result = g_dbus_proxy_call_sync(proxy,
+@@ -159,6 +159,7 @@ GList *get_problems_over_dbus(bool authorize)
+     {
+         error_msg(_("Can't get problem list from abrt-dbus: %s"), error->message);
+         g_error_free(error);
+        return ERR_PTR;
+     }
+ 
+     GList *list = NULL;
+@@ -172,4 +173,4 @@ GList *get_problems_over_dbus(bool authorize)
+     }
+ 
+     return list;
+-}
+\ No newline at end of file
+}
+-- 
+1.7.12
+
--- a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
+++ b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
@ -0,0 +1,398 @@
+From 1f56956ade3bd28ef192fba675e798db58b3ae40 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:45:28 -0400
+Subject: [PATCH] Disable code not relevant for Gentoo
+
+Disable code that is only relevant for an RPM-based distro or that
+requires additional bugs.gentoo.org infrastructure support. Ensure that
+crashes still get analyzed even if they cannot be assigned to any
+package (since we lack any way of doing that at the moment).
+---
+ configure.ac                        |  1 -
+ doc/Makefile.am                     |  2 --
+ src/daemon/Makefile.am              | 18 ----------
+ src/daemon/abrt_event.conf          | 14 +++++---
+ src/plugins/Makefile.am             | 71 +------------------------------------
+ src/plugins/abrt-action-list-dsos   | 18 +++-------
+ src/plugins/ccpp_event.conf         | 29 +--------------
+ src/plugins/ccpp_retrace_event.conf |  8 +----
+ src/plugins/koops_event.conf        | 15 --------
+ src/plugins/python_event.conf       | 16 ---------
+ src/plugins/xorg_event.conf         |  2 +-
+ 11 files changed, 17 insertions(+), 177 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb2b986..a78d9f8 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -79,7 +79,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
+ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+-PKG_CHECK_MODULES([RPM], [rpm])
+ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
+ PKG_CHECK_MODULES([NSS], [nss])
+ PKG_CHECK_MODULES([BTPARSER], [btparser])
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 0a829d4..33cc8e6 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -16,11 +16,9 @@ MAN1_TXT += abrt-cli.txt
+ MAN1_TXT += abrt-action-save-package-data.txt
+ MAN1_TXT += abrt-install-ccpp-hook.txt
+ MAN1_TXT += abrt-action-analyze-vmcore.txt
+-MAN1_TXT += abrt-bodhi.txt
+ 
+ MAN5_TXT =
+ MAN5_TXT += abrt.conf.txt
+-MAN5_TXT += abrt-action-save-package-data.conf.txt
+ 
+ MAN8_TXT =
+ MAN8_TXT += abrtd.txt abrt-dbus.txt
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 2e24403..777dfc4 100644
+--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
+@@ -6,9 +6,6 @@ dist_eventsconf_DATA = \
+ bin_SCRIPTS = \
+     abrt-handle-upload
+ 
+-bin_PROGRAMS = \
+-    abrt-action-save-package-data
+-
+ sbin_PROGRAMS = \
+     abrtd \
+     abrt-server
+@@ -55,21 +52,6 @@ abrt_handle_event_LDADD = \
+     $(LIBREPORT_LIBS) \
+     $(BTPARSER_LIBS)
+ 
+-abrt_action_save_package_data_SOURCES = \
+-    rpm.h rpm.c \
+-    abrt-action-save-package-data.c
+-abrt_action_save_package_data_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    -D_GNU_SOURCE
+-abrt_action_save_package_data_LDADD = \
+-    $(RPM_LIBS) \
+-    $(LIBREPORT_LIBS) \
+-    ../lib/libabrt.la
+-
+ daemonconfdir = $(CONF_DIR)
+ dist_daemonconf_DATA = \
+     abrt.conf \
+diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
+index a1411e4..aab7dc0 100644
+--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
+@@ -44,7 +44,7 @@
+ 
+ 
+ # Determine in which package/component the crash happened (if not yet done):
+-EVENT=post-create component= remote!=1
+#EVENT=post-create component= remote!=1
+         abrt-action-save-package-data
+ 
+ 
+@@ -60,19 +60,19 @@ EVENT=post-create
+         if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
+ 
+ 
+-EVENT=notify package!= uid!=
+EVENT=notify uid!=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+ 
+-EVENT=notify package!= uid=
+EVENT=notify uid=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR"
+ 
+-EVENT=notify-dup package!= uid!=
+EVENT=notify-dup uid!=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+ 
+-EVENT=notify-dup package!= uid=
+EVENT=notify-dup uid=
+ 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ 	string:"`cat package`" string:"$DUMP_DIR"
+ 
+@@ -108,6 +108,10 @@ EVENT=notify-dup package!= uid=
+ #EVENT=post-create
+         reporter-upload -u scp://user:password@server.name/var/spool/abrt-upload || :
+ 
+#report-gui event is used for reporting by abrt-applet and abrt-gui
+
+EVENT=report-gui analyzer=CCpp
+        report-gtk -e analyze_LocalGDB -e report_Logger -- "$DUMP_DIR"
+ 
+ #open-gui event is used by abrt-gui's "Edit"->"Open problem data"
+ 
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 10ab579..f0248b1 100644
+--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
+@@ -1,7 +1,6 @@
+ -include ../../config.mak
+ 
+ bin_SCRIPTS = \
+-    abrt-action-install-debuginfo \
+     abrt-action-analyze-core \
+     abrt-action-analyze-vmcore \
+     abrt-action-list-dsos
+@@ -16,12 +15,7 @@ bin_PROGRAMS = \
+     abrt-action-trim-files \
+     abrt-action-generate-backtrace \
+     abrt-action-generate-core-backtrace \
+-    abrt-action-analyze-backtrace \
+-    abrt-retrace-client \
+-    abrt-dedup-client \
+-    abrt-bodhi
+-
+-libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
+    abrt-action-analyze-backtrace
+ 
+ #dist_pluginsconf_DATA = Python.conf
+ 
+@@ -44,7 +38,6 @@ eventsconfdir = $(EVENTS_CONF_DIR)
+ 
+ dist_eventsconf_DATA = \
+     ccpp_event.conf \
+-    ccpp_retrace_event.conf \
+     koops_event.conf \
+     xorg_event.conf \
+     vmcore_event.conf \
+@@ -56,7 +49,6 @@ dist_eventsconf_DATA = \
+ 
+ 
+ PYTHON_FILES = \
+-    abrt-action-install-debuginfo.in \
+     abrt-action-list-dsos \
+     abrt-action-analyze-core \
+     abrt-action-analyze-vmcore.in
+@@ -69,7 +61,6 @@ EXTRA_DIST = \
+     collect_vimrc_user.xml.in \
+     collect_vimrc_system.xml.in \
+     analyze_LocalGDB.xml.in \
+-    analyze_RetraceServer.xml.in \
+     analyze_VMcore.xml.in \
+     abrt-action-analyze-vmcore \
+     https-utils.h \
+@@ -204,64 +195,4 @@ abrt_action_analyze_backtrace_LDADD = \
+     $(LIBREPORT_LIBS) \
+     $(BTPARSER_LIBS)
+ 
+-abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \
+-    abrt-action-install-debuginfo-to-abrt-cache.c
+-abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -D_GNU_SOURCE \
+-    $(LIBREPORT_CFLAGS) \
+-    -Wall -Wwrite-strings
+-abrt_action_install_debuginfo_to_abrt_cache_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     ../lib/libabrt.la
+-
+-abrt_retrace_client_SOURCES = \
+-    abrt-retrace-client.c \
+-    https-utils.c
+- abrt_retrace_client_CFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-     $(NSS_CFLAGS) \
+-     $(GLIB_CFLAGS) \
+-     -D_GNU_SOURCE \
+-     $(LIBREPORT_CFLAGS)
+- abrt_retrace_client_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     $(BTPARSER_LIBS) \
+-     $(NSS_LIBS)
+-
+-abrt_dedup_client_SOURCES = \
+-    abrt-dedup-client.c \
+-    https-utils.c
+- abrt_dedup_client_CFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-     $(NSS_CFLAGS) \
+-     $(GLIB_CFLAGS) \
+-     -D_GNU_SOURCE \
+-     $(LIBREPORT_CFLAGS)
+- abrt_dedup_client_LDADD = \
+-     $(LIBREPORT_LIBS) \
+-     $(BTPARSER_LIBS) \
+-     $(NSS_LIBS)
+-
+-abrt_bodhi_SOURCES = \
+-    bodhi.c
+- abrt_bodhi_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(LIBREPORT_WEB_CFLAGS) \
+-    $(JSON_C_CFLAGS) \
+-    $(RPM_CFLAGS) \
+-    -D_GNU_SOURCE
+- abrt_bodhi_LDADD = \
+-    $(JSON_C_LIBS) \
+-    $(RPM_LIBS) \
+-    $(LIBREPORT_LIBS) \
+-    $(LIBREPORT_WEB_LIBS)
+-
+-
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
+index 81a9927..bf1491c 100644
+--- a/src/plugins/abrt-action-list-dsos
+++ b/src/plugins/abrt-action-list-dsos
+@@ -5,7 +5,6 @@
+ import sys
+ import os
+ import getopt
+-import rpm
+ 
+ def log(s):
+     sys.stderr.write("%s\n" % s)
+@@ -68,19 +67,10 @@ if __name__ == "__main__":
+         try:
+             dso_paths = parse_maps(memfile)
+             for path in dso_paths:
+-                ts = rpm.TransactionSet()
+-                mi = ts.dbMatch('basenames', path)
+-                if len(mi):
+-                    for h in mi:
+-                        if outname:
+-                            outfile = xopen(outname, "w")
+-                            outname = None
+-                        outfile.write("%s %s (%s) %s\n" %
+-                                    (path,
+-                                     h[rpm.RPMTAG_NEVRA],
+-                                     h[rpm.RPMTAG_VENDOR],
+-                                     h[rpm.RPMTAG_INSTALLTIME])
+-                                    )
+                if outname:
+                    outfile = xopen(outname, "w")
+                    outname = None
+                outfile.write(path)
+ 
+         except Exception, ex:
+             error_msg_and_die("Can't get the DSO list: %s" % ex)
+diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
+index 81b14d2..cda0b7d 100644
+--- a/src/plugins/ccpp_event.conf
+++ b/src/plugins/ccpp_event.conf
+@@ -31,31 +31,4 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.*
+ # or was this ability lost with move to python installer?
+ EVENT=analyze_LocalGDB analyzer=CCpp
+         abrt-action-analyze-core --core=coredump -o build_ids &&
+-        /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 &&
+-        abrt-action-generate-backtrace &&
+-        abrt-action-analyze-backtrace &&
+-        (
+-            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+-            if test -n "$bug_id"; then
+-                abrt-bodhi -r -b $bug_id
+-            fi
+-        )
+-
+-
+-# Bugzilla requires nonempty duphash
+-EVENT=report_Bugzilla analyzer=CCpp duphash!=
+-        abrt-dedup-client
+-        test -f component || abrt-action-save-package-data
+-        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=CCpp
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=CCpp
+-        reporter-ureport -r
+-
+-# Reporting of C/Cpp problems
+-EVENT=report-gui analyzer=CCpp
+-        report-gtk -e report_uReport -e analyze_RetraceServer -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+        abrt-action-generate-backtrace
+diff --git a/src/plugins/ccpp_retrace_event.conf b/src/plugins/ccpp_retrace_event.conf
+index 60e53d7..893502f 100644
+--- a/src/plugins/ccpp_retrace_event.conf
+++ b/src/plugins/ccpp_retrace_event.conf
+@@ -1,9 +1,3 @@
+ EVENT=analyze_RetraceServer analyzer=CCpp
+         abrt-retrace-client batch --dir "$DUMP_DIR" --status-delay 10 &&
+-        abrt-action-analyze-backtrace &&
+-        (
+-            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+-            if test -n "$bug_id"; then
+-                abrt-bodhi -r -b $bug_id
+-            fi
+-        )
+        abrt-action-analyze-backtrace
+diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf
+index 91759b1..41708df 100644
+--- a/src/plugins/koops_event.conf
+++ b/src/plugins/koops_event.conf
+@@ -14,18 +14,3 @@ EVENT=post-create analyzer=Kerneloops
+ # report
+ #EVENT=report_Kerneloops analyzer=Kerneloops
+         reporter-kerneloops
+-
+-EVENT=report_Bugzilla analyzer=Kerneloops
+-        reporter-bugzilla -b
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Kerneloops
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Kerneloops
+-        reporter-ureport -r
+-
+-# Reporting of kernel oopses
+-EVENT=report-gui analyzer=Kerneloops
+-        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
+index e60df11..66b41f2 100644
+--- a/src/plugins/python_event.conf
+++ b/src/plugins/python_event.conf
+@@ -1,19 +1,3 @@
+ EVENT=post-create analyzer=Python
+         abrt-action-analyze-python
+         abrt-action-generate-core-backtrace
+-
+-EVENT=report_Bugzilla analyzer=Python
+-        test -f component || abrt-action-save-package-data
+-        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Python
+-        reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Python
+-        reporter-ureport -r
+-
+-# Reporting of python exceptions
+-EVENT=report-gui analyzer=Python
+-        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/xorg_event.conf b/src/plugins/xorg_event.conf
+index b974a6b..5476230 100644
+--- a/src/plugins/xorg_event.conf
+++ b/src/plugins/xorg_event.conf
+@@ -33,4 +33,4 @@ EVENT=report_Bugzilla analyzer=xorg
+ 
+ # Reporting of xorg problems
+ EVENT=report-gui analyzer=xorg
+-    report-gtk -e report_Bugzilla -- "$DUMP_DIR"
+    report-gtk -e report_Logger -- "$DUMP_DIR"
+-- 
+1.7.12
+
--- a/app-admin/abrt/files/abrt-2.0.12-init
+++ b/app-admin/abrt/files/abrt-2.0.12-init
@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/files/abrt-2.0.12-init,v 1.1 2012/09/22 20:12:52 tetromino Exp $
+
+description="Automated crash detection service"
+
+depend() {
+	need dbus logger
+}
+
+start() {
+	ebegin "Starting abrtd"
+	start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \
+		--exec /usr/sbin/abrtd -- ${ABRTD_OPTS}
+	eend $?
+
+	if [[ "${START_VMCORE}" = "yes" ]]; then
+		ebegin "Running abrt-harvest-vmcore"
+		/usr/sbin/abrt-harvest-vmcore
+		eend $?
+	fi
+
+	if [[ "${START_CCPP}" = "yes" ]]; then
+		ebegin "Installing abrt-ccpp hook"
+		/usr/sbin/abrt-install-ccpp-hook install
+		eend $?
+	fi
+
+	if [[ "${START_OOPS}" = "yes" ]]; then
+		ebegin "Starting abrt-dump-oops"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/abrt/abrt-dump-oops.pid \
+			--make-pidfile --background \
+			--exec /usr/bin/abrt-dump-oops -- ${OOPS_OPTS}
+		eend $?
+	fi
+}
+
+stop() {
+	if [[ "${START_OOPS}" = "yes" ]]; then
+		ebegin "Stopping abrt-dump-oops"
+		start-stop-daemon --stop --quiet \
+			--pidfile /var/run/abrt/abrt-dump-oops.pid
+		eend $?
+	fi
+
+	if [[ "${START_CCPP}" = "yes" ]]; then
+		ebegin "Uninstalling abrt-ccpp hook"
+		/usr/sbin/abrt-install-ccpp-hook uninstall
+		eend $?
+	fi
+
+	ebegin "Stopping abrtd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid
+	eend $?
+}
--- a/app-admin/apg/apg-2.3.0b-r5.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r5.ebuild,v 1.8 2012/05/27 18:09:40 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r5.ebuild,v 1.9 2012/09/23 03:32:39 blueness Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"

 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"

 DEPEND="cracklib? ( sys-libs/cracklib )"
--- a/app-admin/denyhosts/denyhosts-2.6-r6.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.6-r6.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r6.ebuild,v 1.1 2012/09/23 08:25:09 pacho Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+MY_PN="DenyHosts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="http://www.denyhosts.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="${MY_PN}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# changes default file installations
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-log-injection-regex.patch
+
+	# Multiple patches from Fedora and Debian
+	epatch "${FILESDIR}"/${P}-daemon-control.patch
+	epatch "${FILESDIR}"/${P}-defconffile.patch
+	epatch "${FILESDIR}"/${P}-foreground_mode.patch
+	epatch "${FILESDIR}"/${P}-hostname.patch
+	epatch "${FILESDIR}"/${P}-plugin_deny.patch
+	epatch "${FILESDIR}"/${P}-single_config_switch.patch
+
+	sed -i -e 's:DENY_THRESHOLD_VALID = 10:DENY_THRESHOLD_VALID = 5:' \
+		denyhosts.cfg-dist || die "sed failed"
+}
+
+src_install() {
+	DOCS="CHANGELOG.txt README.txt PKG-INFO"
+	distutils_src_install
+
+	insinto /etc
+	insopts -m0640
+	newins denyhosts.cfg-dist denyhosts.conf
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init denyhosts
+
+	# build system installs docs that we installed above
+	rm -f "${D}"/usr/share/denyhosts/*.txt
+
+	keepdir /var/lib/denyhosts
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	if [[ ! -f "${ROOT}etc/hosts.deny" ]]; then
+		touch "${ROOT}etc/hosts.deny"
+	fi
+
+	if [ "$(rc-config list default | grep denyhosts)" = "" ] ; then
+	elog "You can configure DenyHosts to run as a daemon by running:"
+	elog
+	elog "rc-update add denyhosts default"
+	elog
+	fi
+
+	elog "To run DenyHosts as a cronjob instead of a daemon add the following"
+	elog "to /etc/crontab"
+	elog "# run DenyHosts every 10 minutes"
+	elog "*/10  *  * * *	root	/usr/bin/denyhosts.py -c /etc/denyhosts.conf"
+	elog
+	elog "More information can be found at http://denyhosts.sourceforge.net/faq.html"
+	elog
+	ewarn "Modify /etc/denyhosts.conf to suit your environment system."
+}
--- a/app-admin/denyhosts/files/denyhosts-2.6-daemon-control.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-daemon-control.patch
@ -0,0 +1,12 @@
+diff -up ./daemon-control-dist.orig ./daemon-control-dist
+--- ./daemon-control-dist.orig	2006-04-21 18:04:43.000000000 -0500
+++ ./daemon-control-dist	2008-08-28 11:05:01.000000000 -0500
+@@ -13,7 +13,7 @@
+ 
+ DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
+ DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
+-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG   = "/etc/denyhosts.conf"
+ 
+ PYTHON_BIN      = "/usr/bin/env python"
+ 
--- a/app-admin/denyhosts/files/denyhosts-2.6-defconffile.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-defconffile.patch
@ -0,0 +1,12 @@
+diff -up ./DenyHosts/constants.py.defconffile ./DenyHosts/constants.py
+--- ./DenyHosts/constants.py.defconffile	2008-07-01 18:12:34.000000000 -0500
+++ ./DenyHosts/constants.py	2008-07-01 18:12:43.000000000 -0500
+@@ -36,7 +36,7 @@ PURGE_HISTORY = "purge-history"
+ #                           Miscellaneous constants                             #
+ #################################################################################
+ 
+-CONFIG_FILE = "denyhosts.cfg"  # default can be overridden on cmd line
+CONFIG_FILE = "/etc/denyhosts.conf"  # default can be overridden on cmd line
+ 
+ DENY_DELIMITER = "# DenyHosts:"
+ ENTRY_DELIMITER = " | "
--- a/app-admin/denyhosts/files/denyhosts-2.6-foreground_mode.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-foreground_mode.patch
@ -0,0 +1,137 @@
+From: Marco Bertorello <marco@bertorello.ns0.it>
+Date: Thu, 14 Apr 2011 00:11:35 +0200
+Subject: 08_foreground_mode
+
+Add a useful switch to denyhost for run in foreground/debugging mode
+---
+ DenyHosts/deny_hosts.py |    9 +++++++--
+ denyhosts.py            |   20 +++++++++++++-------
+ 2 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/DenyHosts/deny_hosts.py b/DenyHosts/deny_hosts.py
+index 7a985e6..f308264 100644
+--- a/DenyHosts/deny_hosts.py
+++ b/DenyHosts/deny_hosts.py
+@@ -41,7 +41,7 @@ error = logging.getLogger("denyhosts").error
+ class DenyHosts:
+     def __init__(self, logfile, prefs, lock_file,
+                  ignore_offset=0, first_time=0,
+-                 noemail=0, daemon=0):
+                 noemail=0, daemon=0, foreground=0):
+         self.__denied_hosts = {}
+         self.__prefs = prefs
+         self.__lock_file = lock_file
+@@ -49,6 +49,7 @@ class DenyHosts:
+         self.__noemail = noemail
+         self.__report = Report(prefs.get("HOSTNAME_LOOKUP"), is_true(prefs['SYSLOG_REPORT']))
+         self.__daemon = daemon
+        self.__foreground = foreground
+         self.__sync_server = prefs.get('SYNC_SERVER')
+         self.__sync_upload = is_true(prefs.get("SYNC_UPLOAD"))
+         self.__sync_download = is_true(prefs.get("SYNC_DOWNLOAD"))
+@@ -87,7 +88,7 @@ class DenyHosts:
+             info("Log file size has not changed.  Nothing to do.")
+ 
+             
+-        if daemon:
+        if daemon and not foreground:
+             info("launching DenyHosts daemon (version %s)..." % VERSION)
+             #logging.getLogger().setLevel(logging.WARN)
+ 
+@@ -101,6 +102,10 @@ class DenyHosts:
+                 self.runDaemon(logfile, last_offset)
+             else:
+                 die("Error creating daemon: %s (%d)" % (retCode[1], retCode[0]))
+        elif foreground:
+            info("launching DenyHosts (version %s)..." % VERSION)
+            self.__lock_file.remove()
+            self.runDaemon(logfile, last_offset)
+ 
+ 
+     def killDaemon(self, signum, frame):
+diff --git a/denyhosts.py b/denyhosts.py
+index 48bd837..727e565 100755
+--- a/denyhosts.py
+++ b/denyhosts.py
+@@ -34,6 +34,7 @@ def usage():
+     print " --migrate: migrate your HOSTS_DENY file so that it is suitable for --purge"
+     print " --purge: expire entries older than your PURGE_DENY setting"
+     print " --daemon: run DenyHosts in daemon mode"
+    print " --foreground: run DenyHosts in foreground mode"
+     print " --sync: run DenyHosts synchronization mode"
+     print " --version: Prints the version of DenyHosts and exits"
+     
+@@ -63,6 +64,7 @@ if __name__ == '__main__':
+     purge = 0
+     sync_mode = 0
+     daemon = 0
+    foreground = 0
+     enable_debug = 0
+     upgrade099 = 0
+     args = sys.argv[1:]
+@@ -70,8 +72,8 @@ if __name__ == '__main__':
+         (opts, getopts) = getopt.getopt(args, 'f:c:dinuvps?hV',
+                                         ["file=", "ignore", "verbose", "debug", 
+                                          "help", "noemail", "config=", "version",
+-                                         "migrate", "purge", "daemon", "sync",
+-                                         "upgrade099"])
+                                         "migrate", "purge", "daemon", "foreground",
+                                         "sync", "upgrade099"])
+     except:
+         print "\nInvalid command line option detected."
+         usage()
+@@ -101,6 +103,8 @@ if __name__ == '__main__':
+             sync_mode = 1
+         if opt == '--daemon':
+             daemon = 1
+        if opt == '--foreground':
+            foreground = 1
+         if opt == '--upgrade099':
+             upgrade099 = 1
+         if opt == '--version':
+@@ -131,21 +135,21 @@ if __name__ == '__main__':
+ 
+     lock_file.create()
+ 
+-    if upgrade099 and not daemon:
+    if upgrade099 and not (daemon or foreground):
+         if not prefs.get('PURGE_DENY'):
+             lock_file.remove()
+             die("You have supplied the --upgrade099 flag, however you have not set PURGE_DENY in your configuration file")
+         else:
+             u = UpgradeTo099(prefs.get("HOSTS_DENY"))
+ 
+-    if migrate and not daemon:
+    if migrate and not (daemon or foreground):
+         if not prefs.get('PURGE_DENY'):
+             lock_file.remove()
+             die("You have supplied the --migrate flag however you have not set PURGE_DENY in your configuration file.")
+         else:
+             m = Migrate(prefs.get("HOSTS_DENY"))
+ 
+-    if purge and not daemon:
+    if purge and not (daemon or foreground):
+         purge_time = prefs.get('PURGE_DENY')
+         if not purge_time:
+             lock_file.remove()
+@@ -162,7 +166,9 @@ if __name__ == '__main__':
+     try:
+         for f in logfiles:
+             dh = DenyHosts(f, prefs, lock_file, ignore_offset,
+-                           first_time, noemail, daemon)
+                           first_time, noemail, daemon, foreground)
+    except KeyboardInterrupt:
+        pass
+     except SystemExit, e:
+         pass
+     except Exception, e:
+@@ -170,7 +176,7 @@ if __name__ == '__main__':
+         print "\nDenyHosts exited abnormally"
+ 
+ 
+-    if sync_mode and not daemon:
+    if sync_mode and not (daemon or foreground):
+         if not prefs.get('SYNC_SERVER'):
+             lock_file.remove()
+             die("You have provided the --sync flag however your configuration file is missing a value for SYNC_SERVER.")
+-- 
--- a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
@ -0,0 +1,21 @@
+diff -up ./denyhosts.py.orig ./denyhosts.py
+--- ./denyhosts.py.orig	2012-01-30 13:14:41.146715839 -0600
+++ ./denyhosts.py	2012-01-30 14:45:14.372539341 -0600
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env python
+ import os
+import platform
+ import sys
+ 
+ import DenyHosts.python_version
+@@ -107,6 +108,10 @@ if __name__ == '__main__':
+             print "DenyHosts version:", VERSION
+             sys.exit(0)
+ 
+    # This is generally expected to be in the environment, but there's no
+    # non-hackish way to get systemd to set it, so just hack it in here.
+    os.environ['HOSTNAME'] = platform.node()
+
+     prefs = Prefs(config_file)    
+             
+     first_time = 0
--- a/app-admin/denyhosts/files/denyhosts-2.6-plugin_deny.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-plugin_deny.patch
@ -0,0 +1,23 @@
+From: Marco Bertorello <marco@bertorello.ns0.it>
+Date: Thu, 14 Apr 2011 00:11:35 +0200
+Subject: 09_plugin_deny
+
+Correct the upstream bug http://sourceforge.net/tracker/index.php?func=detail&aid=1734736&group_id=131204&atid=720419
+---
+ DenyHosts/deny_hosts.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/DenyHosts/deny_hosts.py b/DenyHosts/deny_hosts.py
+index f308264..0f5f48d 100644
+--- a/DenyHosts/deny_hosts.py
+++ b/DenyHosts/deny_hosts.py
+@@ -443,7 +443,7 @@ allowed based on your %s file"""  % (self.__prefs.get("HOSTS_DENY"),
+             self.__report.add_section(msg, new_denied_hosts)
+             if self.__sync_server: self.sync_add_hosts(new_denied_hosts)
+             plugin_deny = self.__prefs.get('PLUGIN_DENY')
+-            if plugin_deny: plugin.execute(plugin_deny, deny_hosts)
+            if plugin_deny: plugin.execute(plugin_deny, new_denied_hosts)
+         
+         new_suspicious_logins = login_attempt.get_new_suspicious_logins()
+         if new_suspicious_logins:
+-- 
--- a/app-admin/denyhosts/files/denyhosts-2.6-single_config_switch.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-single_config_switch.patch
@ -0,0 +1,24 @@
+From: Marco Bertorello <marco@bertorello.ns0.it>
+Date: Thu, 14 Apr 2011 00:11:35 +0200
+Subject: 11_single_config_switch
+
+A patch to prevent denyhosts running with a double --config switch
+---
+ daemon-control-dist |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/daemon-control-dist b/daemon-control-dist
+index 9f42b60..14d0f70 100755
+--- a/daemon-control-dist
+++ b/daemon-control-dist
+@@ -144,7 +144,8 @@ if __name__ == '__main__':
+ 
+     try:
+         if option in ('start', 'restart', 'condrestart'):
+-            if '--config' not in args and '-c' not in args:
+            anystartswith = lambda prefix, xs: any(map(lambda x: x.startswith(prefix), xs))
+            if not anystartswith('--config', args) and '-c' not in args:
+                 args.append("--config=%s" % DENYHOSTS_CFG)
+ 
+         cmd = cases[option]
+-- 
--- a/app-admin/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-admin/eselect-awk/eselect-awk-0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.9 2012/08/26 18:40:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.10 2012/09/23 04:22:07 mattst88 Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-macos"
 IUSE=""

 src_install() {
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild,v 1.1 2012/09/08 00:10:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild,v 1.3 2012/09/23 06:10:44 blueness Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="systemd"

 COMMON_DEPEND=">=dev-libs/glib-2.30:2
--- a/app-arch/alien/alien-8.87.ebuild
+++ b/app-arch/alien/alien-8.87.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.87.ebuild,v 1.3 2012/09/18 14:51:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.87.ebuild,v 1.4 2012/09/23 08:30:10 phajdan.jr Exp $

 EAPI=1

@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ppc x86"
 IUSE="+bzip2"

 RDEPEND="app-arch/rpm
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@ -1,5 +1,3 @@
 DIST bacula-5.0.3.tar.gz 3800556 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4 SHA512 feb4a7333b4c898aec175c6e8b45ce5d4eb6e15100a9f27c6010e1a17b44133b7d181d25419e923321d8bd7147d85342bf1e0dca8387d6e9cd269a0e2fec4626 WHIRLPOOL 65a900cc740a300b509a02d953ec5265e3cfbd2ce85d8e40b47e1f1fdd6d77885ec48e68471cc559accd6707fdd9f1cbb34fba22371e806d404abed052a168fb
-DIST bacula-5.2.10.tar.gz 4110586 SHA256 51f311e6c51d6c9575ca458cd63198c6984eeaaff4ce6f334ff82bc999b8b360 SHA512 908da1308c43d245fe1e481e042b87d8f08f20d653d94448f73cfdb516817bb0d23e763a7fd1a394e80251b6eec7a945f0e19bdad018f7da8827bab0f8b3632d WHIRLPOOL 33b47ced534003981231fe04e8ae897cb42d857f6f784e59b2059b7367181771eac6772d3451c6190adfa68aba36a2e2a6325510067ea9b69f516787fa47b998
 DIST bacula-5.2.12.tar.gz 4147847 SHA256 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887 SHA512 2c2e2e522d0d2e22287145af99b76288dd64c2eaec1fab7864b08019dc2ad1d8fed05b829e8604f47b1e9054a71fcdb7bf637ca8acd6fe26d1ce9cac321a0755 WHIRLPOOL bf79d03bf4c8f2ba07d1dc0a935805b87657dcaef9df4a621a072abb7ce6b7831b8f5974e576227c5b87dcb9e9f604a44b4df102d4f006ce4325949944e9205a
 DIST bacula-5.2.5.tar.gz 4030327 SHA256 d731884b882178c597d8b7ef3f50c5622c87b1760d87133c24524faf43937f6d SHA512 da5e020a5eeefbaef63c5d6e54527b80e8be3c9497a7666709de6a5bc2a05294dbbc2ee5fd0feaf65f710a0d16f172ba487313918fc4503d858b3faf3938cf99 WHIRLPOOL d5e839a31ca0eb3d8bc60f1afdd721e328f5b6a3c2c06980915225ff3d1d0721457e2f31f5e4aeb2b18c943aed46e2e10780650d06ad147ec3d0e3a0633a313c
-DIST bacula-5.2.9.tar.gz 4104956 SHA256 f6421fa49007882f79963ed2544920d8aa4488ce28ca3ccd36d130adbf249e27 SHA512 fd2bb6190692cb9fba476e1bd21087a10dcef2906008cd707334fedba2ec09462e1d0c0992027f5eb6fc1518b119e7ccc1ae79216124209c5f54233699c0a169 WHIRLPOOL e412126b44d60b0a68531dbe8aac7cf2f27a64f23cd7c0e4c3146821ad2a6d3b5d715e842a2813a69a66d90363ec5df817a7249b40a2e0280a9cb6717200e66c
--- a/app-backup/bacula/bacula-5.0.3-r1.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r1.ebuild
@ -1,432 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.13 2012/09/05 08:28:17 jlec Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils multilib python user
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-#DOC_VER="${MY_PV}"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-#		doc? ( ${DOC_SRC_URI} )
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
-
-# maintainer comment:
-# postgresql-base should have USE=threads (see bug 326333) but fails to build
-# atm with it (see bug #300964)
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sys-libs/ncurses"
-#	doc? (
-#		app-text/ghostscript-gpl
-#		dev-tex/latex2html[png]
-#		app-text/dvipdfm
-#	)
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	local -i dbnum=0
-	if ! use bacula-clientonly; then
-		if use mysql; then
-			export mydbtype=mysql
-			let dbnum++
-		fi
-		if use postgres; then
-			export mydbtype=postgresql
-			let dbnum++
-		fi
-		if use sqlite3; then
-			export mydbtype=sqlite3
-			let dbnum++
-		fi
-		if [[ "${dbnum}" -lt 1 ]]; then
-			ewarn
-			ewarn "No database backend selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		elif [[ "${dbnum}" -gt 1 ]]; then
-			ewarn
-			ewarn "Too many database backends selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-	if ! use bacula-clientonly; then
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug #310087
-	epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable static static-tools) \
-			$(use_enable static static-fd) \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			--with-${mydbtype} \
-			--enable-batch-insert"
-		if ! use bacula-nodir; then
-			myconf="${myconf} $(use_enable static static-dir)"
-		fi
-		if ! use bacula-nosd; then
-			myconf="${myconf} $(use_enable static static-sd)"
-		fi
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_enable qt4 bat) \
-		$(use_enable static static-cons)
-		$(use_with python) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--host=${CHOST} \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# build docs from bacula-docs tarball
-#	if use doc; then
-#		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
-#		./configure \
-#			--with-bacula="${S}" \
-#			|| die "configure for bacula-docs failed"
-#		emake -j1 || die "emake for bacula-docs failed"
-#		popd
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doicon scripts/bacula.png || die
-
-	# install bat when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4; then
-		dosbin "${S}"/src/qt-console/.libs/bat || die
-		doicon src/qt-console/images/bat_icon.png || die
-		domenu scripts/bat.desktop || die
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use static; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		if ! use bacula-clientonly; then
-			mv static-bacula-dir bacula-dir || die
-			mv static-bacula-sd bacula-sd || die
-		fi
-		if use qt4; then
-			mv static-bat bat || die
-		fi
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/* || die
-		fperms 0640 /usr/libexec/bacula/updatedb/README || die
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula || die
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts"
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	ecompress "${D}"/usr/share/doc/${PF}/*
-#	if use doc; then
-#		for i in catalog concepts console developers install problems utility; do
-#			dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
-#		done
-#	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim || die
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim || die
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}" || die
-		newconfd "${T}/${script}".confd "${script}" || die
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		ewarn "Please read the manual chapter for how to upgrade your database."
-		ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
-		ewarn "is INSECURE. The script needs to be called with the database access password"
-		ewarn "as a command line parameter, thus, the password can be seen from any other"
-		ewarn "user on the system"
-		ewarn
-		ewarn "NOTICE:"
-		ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
-		ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
-		ewarn "subject to this issue as it parses the director daemon config to extract"
-		ewarn "the configured database connection parameters (including the password)."
-		ewarn
-		ewarn "See also:"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		einfo
-		einfo "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
-		einfo "and gnome (gnome-console) support have been dropped."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
--- a/app-backup/bacula/bacula-5.0.3-r3.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r3.ebuild
@ -1,436 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.8 2012/09/05 08:29:58 jlec Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils multilib python user
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-#DOC_VER="${MY_PV}"
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-
-#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-#		doc? ( ${DOC_SRC_URI} )
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
-
-# maintainer comment:
-# postgresql-base should have USE=threads (see bug 326333) but fails to build
-# atm with it (see bug #300964)
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sys-libs/ncurses"
-#	doc? (
-#		app-text/ghostscript-gpl
-#		dev-tex/latex2html[png]
-#		app-text/dvipdfm
-#	)
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	local -i dbnum=0
-	if ! use bacula-clientonly; then
-		if use mysql; then
-			export mydbtype=mysql
-			let dbnum++
-		fi
-		if use postgres; then
-			export mydbtype=postgresql
-			let dbnum++
-		fi
-		if use sqlite3; then
-			export mydbtype=sqlite3
-			let dbnum++
-		fi
-		if [[ "${dbnum}" -lt 1 ]]; then
-			ewarn
-			ewarn "No database backend selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		elif [[ "${dbnum}" -gt 1 ]]; then
-			ewarn
-			ewarn "Too many database backends selected, defaulting to sqlite3."
-			ewarn "Supported databases are mysql, postgresql, sqlite3"
-			ewarn
-			export mydbtype=sqlite3
-		fi
-	fi
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		# USE=static only supported for bacula-clientonly
-		if use static; then
-			ewarn
-			ewarn "USE=static only supported together with USE=bacula-clientonly."
-			ewarn "Ignoring 'static' useflag."
-			ewarn
-		fi
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/${PV}/${P}-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
-
-	epatch "${FILESDIR}"/${PV}/${P}-fix-static.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			--with-${mydbtype} \
-			--enable-batch-insert"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat)"
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_with python) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# build docs from bacula-docs tarball
-#	if use doc; then
-#		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
-#		./configure \
-#			--with-bacula="${S}" \
-#			|| die "configure for bacula-docs failed"
-#		emake -j1 || die "emake for bacula-docs failed"
-#		popd
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doicon scripts/bacula.png || die
-
-	# install bat when enabled (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		dosbin "${S}"/src/qt-console/.libs/bat || die
-		doicon src/qt-console/images/bat_icon.png || die
-		domenu scripts/bat.desktop || die
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/* || die
-		fperms 0640 /usr/libexec/bacula/updatedb/README || die
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula || die
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts"
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT technotes
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim || die
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim || die
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}" || die
-		newconfd "${T}/${script}".confd "${script}" || die
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
-		ewarn "Please read the manual chapter for how to upgrade your database."
-		ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
-		ewarn "is INSECURE. The script needs to be called with the database access password"
-		ewarn "as a command line parameter, thus, the password can be seen from any other"
-		ewarn "user on the system"
-		ewarn
-		ewarn "NOTICE:"
-		ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
-		ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
-		ewarn "subject to this issue as it parses the director daemon config to extract"
-		ewarn "the configured database connection parameters (including the password)."
-		ewarn
-		ewarn "See also:"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
-		ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
-		ewarn
-		ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
-		ewarn
-		ebeep 5
-		epause 10
-		echo
-
-		einfo
-		einfo "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
-		einfo "and gnome (gnome-console) support have been dropped."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
--- a/app-backup/bacula/bacula-5.2.10.ebuild
+++ b/app-backup/bacula/bacula-5.2.10.ebuild
@ -1,364 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.10.ebuild,v 1.5 2012/09/05 08:29:58 jlec Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils multilib python qt4-r2 user
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	dev-libs/lzo
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		# USE=static only supported for bacula-clientonly
-		if use static; then
-			ewarn
-			ewarn "USE=static only supported together with USE=bacula-clientonly."
-			ewarn "Ignoring 'static' useflag."
-			ewarn
-		fi
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	epatch "${FILESDIR}"/5.2.10/${P}-fix-static.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			$(use_with mysql) \
-			$(use_with sqlite3) \
-			$(use_with postgres postgresql) \
-			--enable-batch-insert"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat)"
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_with python) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT technotes
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# set the value of $mydbtype depending on which database we
-	# specified in the use flags.
-	if use sqlite3; then
-		mydbtype="sqlite3"
-	fi
-	if use postgres; then
-		mydbtype="postgresql"
-	fi
-	if use mysql; then
-		mydbtype="mysql"
-	fi
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
--- a/app-backup/bacula/bacula-5.2.12.ebuild
+++ b/app-backup/bacula/bacula-5.2.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.12.ebuild,v 1.3 2012/09/22 14:55:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.12.ebuild,v 1.5 2012/09/22 21:25:22 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -18,11 +18,10 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
+KEYWORDS="amd64 ~hppa ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"

 DEPEND="
-	>=sys-libs/zlib-1.1.4
 	dev-libs/gmp
 	!bacula-clientonly? (
 		postgres? ( dev-db/postgresql-base[threads] )
@ -34,12 +33,23 @@ DEPEND="
 		x11-libs/qt-svg:4
 		x11-libs/qwt:5
 	)
-	ssl? ( dev-libs/openssl )
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	readline? ( >=sys-libs/readline-4.1 )
-	dev-libs/lzo
-	sys-libs/ncurses"
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses[static-libs]
+		ssl? ( dev-libs/openssl[static-libs] )
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses
+		ssl? ( dev-libs/openssl )
+	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (
 		!bacula-nosd? (
@ -125,6 +135,10 @@ src_prepare() {

 	epatch "${FILESDIR}"/5.2.10/${PN}-5.2.10-fix-static.patch

+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
 	# fix file not found error during make depend
 	epatch "${FILESDIR}"/5.2.12/${P}-depend.patch
 }
@ -167,6 +181,7 @@ src_configure() {
 		$(use_with readline readline /usr) \
 		$(use_with ssl openssl) \
 		$(use_enable ipv6) \
+		$(use_enable acl) \
 		$(use_with tcpd tcp-wrappers)"

 	econf \
--- a/app-backup/bacula/bacula-5.2.9.ebuild
+++ b/app-backup/bacula/bacula-5.2.9.ebuild
@ -1,363 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.6 2012/09/05 08:29:58 jlec Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils multilib python qt4-r2 user
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	dev-libs/lzo
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		# USE=static only supported for bacula-clientonly
-		if use static; then
-			ewarn
-			ewarn "USE=static only supported together with USE=bacula-clientonly."
-			ewarn "Ignoring 'static' useflag."
-			ewarn
-		fi
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-fix-static.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			$(use_with mysql) \
-			$(use_with sqlite3) \
-			$(use_with postgres postgresql) \
-			--enable-batch-insert"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat)"
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_with python) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT technotes
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# set the value of $mydbtype depending on which database we
-	# specified in the use flags.
-	if use sqlite3; then
-		mydbtype="sqlite3"
-	fi
-	if use postgres; then
-		mydbtype="postgresql"
-	fi
-	if use mysql; then
-		mydbtype="mysql"
-	fi
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
--- a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
+++ b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
@ -28,7 +28,7 @@
 -	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS)
 +	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
+	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
 	strip $@
 
 
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild,v 1.9 2012/03/18 19:49:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild,v 1.10 2012/09/23 04:27:40 mattst88 Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl xattr"

 DEPEND=">=net-libs/librsync-0.9.7
--- a/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.5 2012/09/16 19:45:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.7 2012/09/23 07:53:14 phajdan.jr Exp $

 inherit elisp

@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""

 DEPEND=">=virtual/emacs-23"
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@ -1 +1,2 @@
 DIST gentoo-syntax-1.19.tar.bz2 21385 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058 SHA512 ae745375cd4737fe4fa51be2d26c06b0579018b16963cad173af0721cd8a278f7c294fac4eeea9cdd57a41ca20892cdcf988da54049005a2e9aab13c58fdb9fd WHIRLPOOL 1d3883761bb1255021ba7fb2871b7d8edb75785e1a01ab0c5f1165827665dc58e41da6bd89a174c3c38adecd67d1ee6ffaee6648aab3f9c60e52a82b85b5d858
+DIST gentoo-syntax-1.20.tar.bz2 27271 SHA256 9c2bfdfb9f7c29fed99e3cf16e92d6c3e28e939ffeff4964f3984b49a9069686 SHA512 20d85efe13359e8568e3c41531c776e71ed30c5635b9320bfe227f6cc9107178bcf172ac638793e4c7eb0aa9c2aaedc25d8e51707a762f750e2dfc55a80a872f WHIRLPOOL ceefde589ba552f8eaed008e334d36e5ea3b243ff23e126ee51a2df52fe3d4302945be4139e6b78404f09cadd077075c4bd6daf20cc8f179886f0443537440de
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.20.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.20.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.20.ebuild,v 1.1 2012/09/22 22:41:09 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+	elisp-site-regen
+
+	elog "Some optional features may require installation of additional"
+	elog "packages, like app-portage/gentoolkit-dev for echangelog."
+}
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -3,3 +3,5 @@ DIST qemu-1.0-patches.tar.xz 43540 SHA256 32a8b98cd5fd661268328d71efbfafd6597210
 DIST qemu-1.0.1.tar.gz 10853005 SHA256 198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378 SHA512 c3c311288bd9e843c3e9dae9ad36e370ffa6a379878fae1067e656e9a1f38e002314e59f0fc46c84df98bdd4d6b7acc6b99907b3cf04a2b100a752b837da0178 WHIRLPOOL d05e7d97855f67347d7f3e252b7f72f16b112ae2c0b9a9b56e60ab11f78712789d99c35adf09e44c1a4d853a7f24c1dd65ebd7199c5ce66fea00442ff6be6fd0
 DIST qemu-1.0.tar.gz 10848714 SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 SHA512 a49ed9c30f018d361d1cdd71d7149e2373e9243653aee119ece0f2e23d45c61e1fe72412c4a58b6b9906a3003ab70b9a9ba43f090b7edabef3785e04ead5cc70 WHIRLPOOL 850ce298be0c51bfdce3dd987844bda4bd4784016b45f73aab953b56ccde143f67e8a498e3ad1a49b658dcba268b8487ffd0974128342a358ac079055099a0b2
 DIST qemu-1.1.1-1.tar.bz2 9635574 SHA256 6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8 SHA512 4501b024b1d188349ab767f5c4de4a9bd491b7f7cd62ffbcdf49c1983b96ae1c39d9fba170522014b03d15e7fbdcf8c5276e7790818bbeb741f4f9d38e04a4fb WHIRLPOOL 6d8d6758455f3589bb15c4b10e113ef254cff41a1b7eb2e0f8f17da5d39f0b0ac0bc061f36394888fbe7ee44503df03210103e3016e3aa919cc63c5c77b9089b
+DIST qemu-1.1.2.tar.bz2 9644554 SHA256 d1e2bcd13c9ac4602aa2a2804b7a141d02f7c8480a7618355400a2cd3659a4e8 SHA512 1e68f21f5e5a1fbb4fc8cdfbdf32709631583269e0cb56f6d48377bc33c3ebc1be0be9407e8a5c75f69a29250b0b74388cd19f12c6f5ba9c7c3fe3a3c2b7422e WHIRLPOOL 99a1d29ddc312e93ec3a799a0954ce9310e1fc1797eca139dbd4baed596b5374ac2cd04c42d3b82e546d94dbd4943c16db11e522bfa5db6a3c6a2582d25fa761
+DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e
--- a/app-emulation/qemu/files/qemu-1.2.0-cflags.patch
+++ b/app-emulation/qemu/files/qemu-1.2.0-cflags.patch
@ -0,0 +1,15 @@
+don't override user cflags
+
+--- a/configure
+++ b/configure
+@@ -2995,10 +2995,6 @@ fi
+ # End of CC checks
+ # After here, no more $cc or $ld runs
+ 
+-if test "$debug" = "no" ; then
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+-fi
+-
+ # Disable zero malloc errors for official releases unless explicitly told to
+ # enable/disable
+ if test -z "$zero_malloc" ; then
--- a/app-emulation/qemu/qemu-1.1.2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2.ebuild
@ -0,0 +1,255 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
+	# Pending review
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
+vhost-net xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+	!app-emulation/qemu-kvm
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	sys-libs/zlib
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( net-misc/curl )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	jpeg? ( virtual/jpeg )
+	ncurses? ( sys-libs/ncurses )
+	nss? ( dev-libs/nss )
+	opengl? (
+		virtual/opengl
+		x11-libs/libX11
+	)
+	png? ( media-libs/libpng )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? (
+		sys-apps/iproute2
+		net-misc/bridge-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=app-emulation/spice-protocol-0.8.1
+	)
+	ssl? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+"
+
+# alpha ELF binary. don't let portage mess with it
+STRIP_MASK="usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+"
+# keep sorted
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-armeb
+	usr/bin/qemu-cris
+	usr/bin/qemu-i386
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+	usr/bin/qemu-x86_64
+"
+
+pkg_setup() {
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.1-siginfo.patch
+
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+
+	# Fix underlinking.
+	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
+	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		conf_opts="${conf_opts} --disable-system"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	conf_opts="${conf_opts} --disable-debug-info"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		$(use_enable xfs xfsctl)
+		--disable-bsd-user
+	"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-strip \
+		--disable-werror \
+		$(use_enable kvm) \
+		--disable-libiscsi \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)"
+
+	echo ./configure "$@" # show actual options
+	./configure "$@" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dohtml qemu-doc.html qemu-tech.html
+}
+
+pkg_postinst() {
+	use qemu-ifup || return
+	elog "You will need the Universal TUN/TAP driver compiled into your"
+	elog "kernel or loaded as a module to use the virtual network device"
+	elog "if using -net tap.  You will also need support for 802.1d"
+	elog "Ethernet Bridging and a configured bridge if using the provided"
+	elog "qemu-ifup script from /etc/qemu."
+	echo
+}
--- a/app-emulation/qemu/qemu-1.2.0.ebuild
+++ b/app-emulation/qemu/qemu-1.2.0.ebuild
@ -0,0 +1,254 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
+	# Pending review
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static usbredir vde
+vhost-net xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+	!app-emulation/qemu-kvm
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	sys-libs/zlib
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( net-misc/curl )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	jpeg? ( virtual/jpeg )
+	ncurses? ( sys-libs/ncurses )
+	nss? ( dev-libs/nss )
+	opengl? (
+		virtual/opengl
+		x11-libs/libX11
+	)
+	png? ( media-libs/libpng )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? (
+		sys-apps/iproute2
+		net-misc/bridge-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=app-emulation/spice-protocol-0.8.1
+	)
+	ssl? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+"
+
+# alpha ELF binary. don't let portage mess with it
+STRIP_MASK="usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+"
+# keep sorted
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-armeb
+	usr/bin/qemu-cris
+	usr/bin/qemu-i386
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+	usr/bin/qemu-x86_64
+"
+
+pkg_setup() {
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0-cflags.patch
+
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+
+	# Fix underlinking.
+	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
+	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		conf_opts="${conf_opts} --disable-system"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	conf_opts="${conf_opts} --disable-debug-info"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		$(use_enable xfs xfsctl)
+		--disable-bsd-user
+	"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-strip \
+		--disable-werror \
+		$(use_enable kvm) \
+		--disable-libiscsi \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)"
+
+	echo ./configure "$@" # show actual options
+	./configure "$@" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dohtml qemu-doc.html qemu-tech.html
+}
+
+pkg_postinst() {
+	use qemu-ifup || return
+	elog "You will need the Universal TUN/TAP driver compiled into your"
+	elog "kernel or loaded as a module to use the virtual network device"
+	elog "if using -net tap.  You will also need support for 802.1d"
+	elog "Ethernet Bridging and a configured bridge if using the provided"
+	elog "qemu-ifup script from /etc/qemu."
+	echo
+}
--- a/app-laptop/prey/prey-0.5.4.ebuild
+++ b/app-laptop/prey/prey-0.5.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.4.ebuild,v 1.1 2012/07/19 21:42:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.4.ebuild,v 1.2 2012/09/23 08:13:24 phajdan.jr Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://preyproject.com/releases/${PV}/${P}-linux.zip"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gtk userpriv"

 LINGUAS="en it sv es"
--- a/app-mobilephone/obexd/obexd-0.47.ebuild
+++ b/app-mobilephone/obexd/obexd-0.47.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.47.ebuild,v 1.1 2012/08/21 12:49:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.47.ebuild,v 1.2 2012/09/23 03:43:04 blueness Exp $

 EAPI="4"

@ -9,7 +9,7 @@ HOMEPAGE="http://www.bluez.org/"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="-eds nokia -server usb"

 DOCS="AUTHORS ChangeLog README doc/*.txt"
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6-r1.ebuild,v 1.1 2012/05/09 20:43:41 fuzzyray Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml.  This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.6[xml]
-	!>=dev-lang/python-2.6[-xml]
-	!<=app-portage/gentoolkit-dev-0.2.7
-	dev-python/argparse
-	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
-	sys-apps/gawk
-	sys-apps/grep"
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
-	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
-		|| die "setup.py set_version failed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-eread-413577.patch"
-	epatch "${FILESDIR}/${PV}-eshowkw-414627.patch"
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
-
-	# Rename the python versions of revdep-rebuild, since we are not ready
-	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
-	# revdep-rebuild.sh. Leaving the python version available for potential
-	# testing by a wider audience.
-	mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py
-	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
-
-	# Create cache directory for revdep-rebuild
-	dodir /var/cache/revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:root /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild
-		rm "${ED}"/usr/bin/revdep-rebuild.py
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-
-	# Can distutils handle this?
-	dosym eclean /usr/bin/eclean-dist
-	dosym eclean /usr/bin/eclean-pkg
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo
-	einfo "For further information on gentoolkit, please read the gentoolkit"
-	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
-	ewarn
-	ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
-	ewarn "options and default behavior. The list of injected GLSAs"
-	ewarn "has moved to /var/lib/portage/glsa_injected, please"
-	ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
-}
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r2.ebuild
@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6-r2.ebuild,v 1.1 2012/05/17 15:52:31 fuzzyray Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml.  This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.6[xml]
-	!>=dev-lang/python-2.6[-xml]
-	!<=app-portage/gentoolkit-dev-0.2.7
-	dev-python/argparse
-	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
-	sys-apps/gawk
-	sys-apps/grep"
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
-	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
-		|| die "setup.py set_version failed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-eread-413577.patch"
-	epatch "${FILESDIR}/${PV}-eshowkw-414627.patch"
-	epatch "${FILESDIR}/${PV}-gentoolkit-304125.patch"
-	epatch "${FILESDIR}/${PV}-euse-410365.patch"
-	epatch "${FILESDIR}/${PV}-eshowkw-409449.patch"
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
-
-	# Rename the python versions of revdep-rebuild, since we are not ready
-	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
-	# revdep-rebuild.sh. Leaving the python version available for potential
-	# testing by a wider audience.
-	mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py
-	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
-
-	# Create cache directory for revdep-rebuild
-	dodir /var/cache/revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:root /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild
-		rm "${ED}"/usr/bin/revdep-rebuild.py
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-
-	# Can distutils handle this?
-	dosym eclean /usr/bin/eclean-dist
-	dosym eclean /usr/bin/eclean-pkg
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo
-	einfo "For further information on gentoolkit, please read the gentoolkit"
-	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
-	ewarn
-	ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
-	ewarn "options and default behavior. The list of injected GLSAs"
-	ewarn "has moved to /var/lib/portage/glsa_injected, please"
-	ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
-}
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild,v 1.2 2012/04/26 22:19:18 aballier Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml.  This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.6[xml]
-	!>=dev-lang/python-2.6[-xml]
-	!<=app-portage/gentoolkit-dev-0.2.7
-	dev-python/argparse
-	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
-	sys-apps/gawk
-	sys-apps/grep"
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
-	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
-		|| die "setup.py set_version failed"
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
-
-	# Rename the python versions of revdep-rebuild, since we are not ready
-	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
-	# revdep-rebuild.sh. Leaving the python version available for potential
-	# testing by a wider audience.
-	mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py
-	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
-
-	# Create cache directory for revdep-rebuild
-	dodir /var/cache/revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:root /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild
-		rm "${ED}"/usr/bin/revdep-rebuild.py
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-
-	# Can distutils handle this?
-	dosym eclean /usr/bin/eclean-dist
-	dosym eclean /usr/bin/eclean-pkg
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo
-	einfo "For further information on gentoolkit, please read the gentoolkit"
-	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
-	ewarn
-	ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
-	ewarn "options and default behavior. The list of injected GLSAs"
-	ewarn "has moved to /var/lib/portage/glsa_injected, please"
-	ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
-}
--- a/app-shells/mksh/files/mksh-39c-urandom-write.patch
+++ b/app-shells/mksh/files/mksh-39c-urandom-write.patch
@ -1,20 +0,0 @@
-Index: work/mksh/arc4random.c
-===================================================================
--- work.orig/mksh/arc4random.c
-+++ work/mksh/arc4random.c
-@@ -367,14 +367,7 @@ arc4_writeback(uint8_t *buf, size_t len,
- 	memcpy(buf, &num, sizeof (num));
- 	return (do_rd ? 0 : 1);
- #else
-	int fd;
-
-	if ((fd = open(__randomdev, O_WRONLY)) != -1) {
-		if (write(fd, buf, len) < 4)
-			do_rd = 1;
-		close(fd);
-	}
-	return (do_rd || fd == -1 ? 0 : 1);
-+	return (0);
- #endif
- }
- 
--- a/app-shells/mksh/files/mksh-40f-etc-configurable.patch
+++ b/app-shells/mksh/files/mksh-40f-etc-configurable.patch
@ -0,0 +1,30 @@
+Index: sh.h
+===================================================================
+RCS file: /cvs/src/bin/mksh/sh.h,v
+retrieving revision 1.579
+retrieving revision 1.580
+diff -u -r1.579 -r1.580
+--- sh.h	24 Aug 2012 19:03:21 -0000	1.579
+++ sh.h	24 Aug 2012 19:09:34 -0000	1.580
+@@ -959,15 +959,16 @@
+ 
+ /* Determine the location of the system (common) profile */
+ 
+-/* This is deliberately not configurable via CPPFLAGS */
+#ifndef MKSH_DEFAULT_PROFILEDIR
+ #if defined(ANDROID)
+-#define MKSH_ETC_LOCATION	"/system/etc"
+#define MKSH_DEFAULT_PROFILEDIR	"/system/etc"
+ #else
+-#define MKSH_ETC_LOCATION	"/etc"
+#define MKSH_DEFAULT_PROFILEDIR	"/etc"
+#endif
+ #endif
+ 
+-#define MKSH_SYSTEM_PROFILE	MKSH_ETC_LOCATION "/profile"
+-#define MKSH_SUID_PROFILE	MKSH_ETC_LOCATION "/suid_profile"
+#define MKSH_SYSTEM_PROFILE	MKSH_DEFAULT_PROFILEDIR "/profile"
+#define MKSH_SUID_PROFILE	MKSH_DEFAULT_PROFILEDIR "/suid_profile"
+ 
+ 
+ /* Used by v_evaluate() and setstr() to control action when error occurs */
--- a/app-shells/mksh/mksh-40f.ebuild
+++ b/app-shells/mksh/mksh-40f.ebuild
@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40f.ebuild,v 1.1 2012/04/07 00:49:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40f.ebuild,v 1.2 2012/09/22 20:04:21 ottxor Exp $

-inherit eutils
+EAPI=4
+
+inherit eutils toolchain-funcs unpacker

 DESCRIPTION="MirBSD KSH Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
@ -10,27 +12,28 @@ ARC4_VERSION="1.14"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND="app-arch/cpio"
 RDEPEND=""
 S="${WORKDIR}/${PN}"

-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
+src_prepare(){
+	epatch "${FILESDIR}/${P}-etc-configurable.patch"
 }

 src_compile() {
 	tc-export CC
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	# we can't assume lto existing/enabled, so we add a fallback
 	sh Build.sh -r -c lto || sh Rebuild.sh || die
 }

 src_install() {
 	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
 }

 src_test() {
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@ -1,38 +1,45 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.2 2011/02/13 00:22:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.3 2012/09/22 20:04:21 ottxor Exp $

-inherit eutils cvs
+EAPI=4

-ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
-ECVS_MODULE="mksh"
-ECVS_USER="_anoncvs"
-ECVS_AUTH="ext"
+inherit eutils toolchain-funcs
+
+if [[ $PV = 9999 ]]; then
+	inherit cvs
+	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+	ECVS_MODULE="mksh"
+	ECVS_USER="_anoncvs"
+	ECVS_AUTH="ext"
+	KEYWORDS=""
+else
+	inherit unpacker
+	DEPEND="app-arch/cpio"
+	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+fi

 DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
-DEPEND=""
+DEPEND="${DEPEND}"
 RDEPEND=""
 S="${WORKDIR}/${PN}"

-src_unpack() {
-	cvs_src_unpack
-}
-
 src_compile() {
 	tc-export CC
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	sh Build.sh -r || die
 }

 src_install() {
 	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
 }

 src_test() {
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild,v 1.4 2012/09/18 15:03:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild,v 1.5 2012/09/23 07:54:54 phajdan.jr Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"

 RDEPEND=">=app-text/build-docbook-catalog-1.1
--- a/app-text/mftrace/mftrace-1.2.18.ebuild
+++ b/app-text/mftrace/mftrace-1.2.18.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.18.ebuild,v 1.3 2012/09/07 15:47:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.18.ebuild,v 1.4 2012/09/23 08:26:11 phajdan.jr Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -11,7 +11,7 @@ DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
 HOMEPAGE="http://lilypond.org/mftrace/"
 SRC_URI="http://lilypond.org/download/sources/mftrace/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-fbsd"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
--- a/dev-games/simgear/simgear-2.8.0-r1.ebuild
+++ b/dev-games/simgear/simgear-2.8.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.8.0-r1.ebuild,v 1.1 2012/09/21 22:37:18 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.8.0-r1.ebuild,v 1.2 2012/09/22 21:25:51 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ HOMEPAGE="http://www.simgear.org/"
 SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="debug jpeg subversion test"

--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@ -2,4 +2,4 @@ DIST 2p-2.1.1.zip 1879216 SHA256 fe49fbee0c22c3bb6799895f4e1694ead184a689ab753eb
 DIST 2p-2.3.0alpha.zip 2757862 SHA256 f8c1da73d0a5ca04267aec46e0636754dad747f4354069fad40e054aaacbfed2 SHA512 464bd6755e2336bdf1edbf4e2fb415797a1194ae0f530990644a56ea7b9f228a5043ac151b6167350a4623b21128e58fc35013e4b1d88f7965052769a89791b3 WHIRLPOOL 85d017d1dcac71da4fa717a3d33b532627eb8cdb237b6f7582f4f3d782396520b66d7ce6f82bb5e010f4cadb6dff8ed088121c6e585a188232b24f711f96a00a
 DIST 2p-2.3.1.zip 2534203 SHA256 7f56638d0401805008155749fb4fa367e4d21eb0a1d9be7c2e7fbc77514864c4 SHA512 7b403828ad5c9cde2932a94a9dd314f9a03b42bdf3b9f1678e583e85fe9dc64bb15fcb92196861faa0c0a915a6c19e257f4fd9b4d374a8be1e8a5e1989537bbc WHIRLPOOL 3e92f62c3f6a9302c8e9d28eaaab0c6dd2c857346126f51c4a8fa08e2bea448339838db4dcdfafb574954e8f3cd89f19c55efbdaa9028340f12a1fd419136095
 DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
-DIST tuprolog-2.5.0.zip 4847183 RMD160 e152b253f0ade646dd0227fc941f1d0970c928ff SHA1 f384821d700182196ab36c2ed56405d9e54bfd50 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04
+DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04
--- a/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild,v 1.4 2012/08/04 13:57:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild,v 1.5 2012/09/23 08:25:33 phajdan.jr Exp $

 EAPI=2

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tuprolog/${MY_P}.zip"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc test"

 RDEPEND=">=virtual/jdk-1.5
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@ -1,5 +1,5 @@
 DIST v8-3.11.10.20.tar.bz2 10115536 SHA256 69cc90bdf1032d7a8a14ea9353b9b45969699e8adb31bfb919f1aa7f0a981391 SHA512 8532159a2671d7fbe72196f64d7cf5d391f96e4f326b8d490b00051c55df14553b5c2592c68abfab7e5d6510c35a3b2deb44af75a92daf880ef8d7f0cdffef71 WHIRLPOOL 2874fb3698f27634000631afa09600b6c65be2acaf545cbfa3ed8119ddc39a9a8c71d158a8e4167d288c82247d8f2131dfc7a88aaca5e44b72d664eb5f389ccd
-DIST v8-3.12.19.7.tar.bz2 10182432 SHA256 42d06b996f0fdafed641b8cca9961f7c19a893fff486888351622edfb5d49a4e SHA512 0a7034c421d0638a42014fd2dbb2a8a483482736173e64dc01c2b4680630fb2cb1f124afba069955e97de8880ba5a901ec48355e06dc84450c684887eace0549 WHIRLPOOL 98702f547b4406bd5f51a7d5c0154080ce5391531fe28098fdbc8457262f90559ce7e902a6a36a251611a5a9f241f16d4eca1e22dc5a701c0a807558d27c5af8
+DIST v8-3.12.19.10.tar.bz2 10185871 SHA256 39b7fbc7e115ab59bb47d662f7747fabfef9598fa266811cd6713a620bd9d155 SHA512 8f4825326ff5b72f4a9cbdf652f749d70e30389f0b8039972345f2313a214c844e9ced39fc904e9028106cd1470cfbfa821f0d5e455845c287e1b80cc9149a17 WHIRLPOOL 5b37e408d6fb116662c69964a7f846efe7d48662501db350f51766fea48ae727534656d0c57e36bd9a33601d1a9105ed8dda5fd6a0b23ec1dfa1db50ede3bf41
 DIST v8-3.12.19.8.tar.bz2 10181295 SHA256 ec18159c456e1c2d0bf5f963aa2b8925660a051ff1f56e6864ffadfd3f176d54 SHA512 2583a3bada94168ea5f23556ce3173fa011ef272683013e575de87563b48e5d5a348ac194d043872c3796f17f6596184dec5291522f4726aab004e5379833bf2 WHIRLPOOL 75e5482c23b9b4a32eed64fd95b294e194c15c87aaf2bb154758c6d63fae48653323b4e81be5f08df052784529992680e225ff54d36494bdc67e93fa7889875b
 DIST v8-3.13.3.1.tar.bz2 10186822 SHA256 c46a9f98bf7aa6fc35b8cb1537c40a843f160a412d931e7e7037e7027aedf702 SHA512 216fcdb764dd05579cb36763719f35119bb2ef709f66c15f0d4aab15b477f4dc1e9949959bcdf4ef73a947dbc58d63a6a1c75312a761a0e64b790a37a7f08c39 WHIRLPOOL 052450e4ccb961cd874a49345d2d76ef3ed49dc9947c49e0130f54507aaf60bc61a28a9aaa78197efdcea994372c223b5ab825cdacf1603161371573fbbf9640
 DIST v8-3.13.6.tar.bz2 10197030 SHA256 356e166e922005b784445388a5c46aceef6c702fecd84435a21e105345ecb94c SHA512 67b8bab0d5e8059c8abb17d8acb3b698b9ee9c9b57bd9fd3dd5489b4e6e544cd5a9b11c6638230f73a94a6e18c4fcb532f2b2ca7bab2d8b1721f5f70ab39e967 WHIRLPOOL ce8f22573c4857492a63ab7fbec76077628a34c9e9d2e8d188723b6950fb439c33932bff0cd52260224a352cbc49bb0ca50f877e57f1f578d68fae03deaed4ee
--- a/dev-lang/v8/v8-3.12.19.10.ebuild
+++ b/dev-lang/v8/v8-3.12.19.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.7.ebuild,v 1.1 2012/09/08 19:27:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.10.ebuild,v 1.1 2012/09/22 17:40:20 floppym Exp $

 EAPI="4"

--- a/dev-libs/libchewing/libchewing-0.3.3.ebuild
+++ b/dev-libs/libchewing/libchewing-0.3.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3.ebuild,v 1.4 2012/09/09 20:59:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libchewing/libchewing-0.3.3.ebuild,v 1.5 2012/09/23 07:50:00 phajdan.jr Exp $

 EAPI=3

@ -12,7 +12,7 @@ SRC_URI="http://chewing.csie.net/download/libchewing/${P}.tar.bz2"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug test static-libs"

 RDEPEND=""
--- a/dev-libs/libgdata/libgdata-0.10.2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.10.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.10.2.ebuild,v 1.1 2012/03/15 01:24:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.10.2.ebuild,v 1.3 2012/09/23 05:53:42 blueness Exp $

 EAPI="4"
 GCONF_DEBUG="yes"
@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/libgdata"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc gnome +introspection static-libs"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"

 # gtk+ is needed for gdk
 # configure checks for gtk:3, but only uses it for demos which are not installed
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@ -1,2 +1,3 @@
 DIST libreport-2.0.10.tar.gz 1204194 SHA256 ab8f2bb2eeb93719b6a946b8a810527cec653815fd59c3fb03efca88e6e80408 SHA512 f9eca6aacb28c856e5bc109545dbd371baf57de4f2431b988dfce0d9d1a1e38269a056a924453bbfaed7c80890ddddbddca086754385a7397e23b6d1b8a17702 WHIRLPOOL 2429cd98c9d897a953956d92a9680fd65ccaf79f89da84c0862356c11acf318a50b41a674ac4de07e020836a2e4efcd38f1d949e2136a2abb854324a2c9a2a5a
+DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301
 DIST libreport-2.0.9.tar.gz 1088917 SHA256 c63f259838d75c42f7557fe00b57beef7e889723864d35c89a003c81a8722e3d SHA512 38a3b1b7e5f8938a359a83b1a74087711fc369dc990c4a9727587473bd86aee297734fb0fdf30cc39e937f2ed03fb3697926d4fb7780dc82313f70a24d5d535b WHIRLPOOL cf16faccb5e6a02f3b38031433f17a2c8506f9fbcff9892c228459334f3afb2b6e4d107652a97fd24688f766c29b5d05e911d5fa47910f90ede49fa230bc6ab6
--- a/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
+++ b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
@ -0,0 +1,80 @@
+From cb7d7fe5b2daf4dac3b8a1616461a0c840e18b73 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 03:06:03 -0400
+Subject: [PATCH] Fix automake-1.12 autoreconf issues.
+
+Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am
+
+Need AM_PROG_CC_C_O for src/cli/cli.c
+
+gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
+problems for automake-1.12.
+---
+ configure.ac            | 8 +++-----
+ src/lib/Makefile.am     | 2 +-
+ src/plugins/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd50bcf..3955689 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([libreport],
+ 	[crash-catcher@fedorahosted.org])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to ./configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+@@ -11,8 +11,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+ AM_SILENT_RULES([yes])
+ 
+ AC_DISABLE_STATIC
+AM_PROG_AR
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+AM_PROG_CC_C_O
+ AC_PROG_LN_S
+ 
+ AC_SYS_LARGEFILE
+@@ -33,9 +34,6 @@ GETTEXT_PACKAGE=libreport
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ dnl ****** END ****************************************
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5befe7d..2c51931 100644
+--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
+@@ -121,7 +121,7 @@ libreport_web_la_LIBADD = \
+     libreport.la
+ 
+ $(DESTDIR)/$(DEBUG_DUMPS_DIR):
+-	$(mkdir_p) '$@'
+	$(MKDIR_P) '$@'
+ # no need to chmod it here
+ #chmod 1777 '$@'
+ install-data-local: $(DESTDIR)/$(DEBUG_DUMPS_DIR)
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 3f9dfd7..795d198 100644
+--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
+@@ -40,7 +40,7 @@ EXTRA_DIST = \
+     report_Uploader.xml.in
+ 
+ $(DESTDIR)/$(DEBUG_INFO_DIR):
+-	$(mkdir_p) '$@'
+	$(MKDIR_P) '$@'
+ 
+ reporter_upload_SOURCES = \
+     reporter-upload.c
+-- 
+1.7.12
+
--- a/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
+++ b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
@ -0,0 +1,295 @@
+From 624d523361dcf8c10742cbcb1a017e21675002ff Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 02:17:08 -0400
+Subject: [PATCH] Replace Fedora defaults with Gentoo ones, and disable code
+ not relevant for Gentoo
+
+Disable bugzilla and ureport plugins (they require Gentoo infrastructure
+changes). Fix libreport-web.pc to not rely on xmlrpc.pc, which Gentoo
+does not have.
+
+Disble mailx post-create by default to avoid "abrtd: 'post-create' ...
+exited with 141" errors.
+---
+ doc/Makefile.am                    |  2 -
+ doc/reporter-bugzilla.txt          |  2 +-
+ libreport-web.pc.in                |  6 +--
+ src/lib/dump_dir.c                 |  2 +-
+ src/plugins/Makefile.am            | 83 ++------------------------------------
+ src/plugins/bugzilla.conf          |  2 +-
+ src/plugins/mailx_event.conf       |  2 +-
+ src/plugins/report_Bugzilla.conf   |  2 +-
+ src/plugins/report_Bugzilla.xml.in |  4 +-
+ src/plugins/reporter-bugzilla.c    |  2 +-
+ src/report-python/__init__.py      |  4 +-
+ 11 files changed, 16 insertions(+), 95 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 542fe4c..863b6d1 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -9,11 +9,9 @@ XMLTO_SILENT_0 = @echo "  XMLTO " $@;
+ 
+ MAN1_TXT =
+ MAN1_TXT += report-cli.txt
+-MAN1_TXT += reporter-bugzilla.txt
+ MAN1_TXT += reporter-kerneloops.txt
+ MAN1_TXT += reporter-mailx.txt
+ MAN1_TXT += reporter-print.txt
+-MAN1_TXT += reporter-rhtsupport.txt
+ MAN1_TXT += reporter-upload.txt
+ MAN1_TXT += report.txt
+ 
+diff --git a/doc/reporter-bugzilla.txt b/doc/reporter-bugzilla.txt
+index 3cedf73..734d598 100644
+--- a/doc/reporter-bugzilla.txt
+++ b/doc/reporter-bugzilla.txt
+@@ -44,7 +44,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
+ 	Password to Bugzilla account.
+ 
+ 'BugzillaURL'::
+-	Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com)
+	Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org/)
+ 
+ 'SSLVerify'::
+ 	Use yes/true/on/1 to verify server's SSL certificate. (default: yes)
+diff --git a/libreport-web.pc.in b/libreport-web.pc.in
+index c9af1d2..14505f8 100644
+--- a/libreport-web.pc.in
+++ b/libreport-web.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: libreport
+ Description: Library providing network API for libreport
+ Version: @VERSION@
+-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json btparser libreport
+-Libs: -L${libdir} -lreport-web
+-Cflags:
+Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport
+Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web
+Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@
+ 
+diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
+index 0fc7da7..41e4f55 100644
+--- a/src/lib/dump_dir.c
+++ b/src/lib/dump_dir.c
+@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid, const char *chroot_di
+         release = load_text_file("/etc/system-release",
+                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
+         if (!release)
+-            release = load_text_file("/etc/redhat-release", /*flags:*/ 0);
+            release = load_text_file("/etc/gentoo-release", /*flags:*/ 0);
+         dd_save_text(dd, FILENAME_OS_RELEASE, release);
+         if (chroot_dir)
+         {
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 967596f..3f9dfd7 100644
+--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
+@@ -1,36 +1,27 @@
+ pluginslibdir = $(PLUGINS_LIB_DIR)
+ 
+ bin_PROGRAMS = \
+-    reporter-bugzilla \
+-    reporter-rhtsupport \
+     reporter-kerneloops \
+     reporter-upload \
+     reporter-mailx \
+     reporter-print \
+-    report \
+-    reporter-ureport
+    report
+ 
+ pluginsconfdir = $(PLUGINS_CONF_DIR)
+ 
+ reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
+ 
+ dist_reportpluginsconf_DATA = \
+-    bugzilla.conf \
+-    rhtsupport.conf \
+     mailx.conf
+ 
+ eventsdir = $(EVENTS_DIR)
+ 
+ dist_events_DATA = \
+-    report_Bugzilla.xml \
+-    report_Bugzilla.conf \
+     report_Logger.conf \
+     report_Logger.xml \
+     report_Mailx.xml \
+-    report_RHTSupport.xml \
+     report_Kerneloops.xml \
+-    report_Uploader.xml \
+-    report_uReport.xml
+    report_Uploader.xml
+ 
+ @INTLTOOL_XML_RULE@
+ 
+@@ -39,74 +30,18 @@ eventsconfdir = $(EVENTS_CONF_DIR)
+ dist_eventsconf_DATA = \
+     mailx_event.conf \
+     print_event.conf \
+-    bugzilla_event.conf \
+-    rhtsupport_event.conf \
+     uploader_event.conf
+ 
+ EXTRA_DIST = \
+-    report_Bugzilla.xml.in \
+-    report_Bugzilla.conf \
+     report_Logger.conf \
+     report_Logger.xml.in \
+     report_Mailx.xml.in \
+-    report_RHTSupport.xml.in \
+     report_Kerneloops.xml.in \
+-    report_Uploader.xml.in \
+-    report_uReport.xml.in
+    report_Uploader.xml.in
+ 
+ $(DESTDIR)/$(DEBUG_INFO_DIR):
+ 	$(mkdir_p) '$@'
+ 
+-reporter_bugzilla_SOURCES = \
+-    reporter-bugzilla.c rhbz.c rhbz.h
+-reporter_bugzilla_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DBIN_DIR=\"$(bindir)\" \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    -DLOCALSTATEDIR='"$(localstatedir)"' \
+-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+-    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+-    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_bugzilla_LDADD = \
+-    $(GLIB_LIBS) \
+-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
+-    ../lib/libreport-web.la \
+-    ../lib/libreport.la
+-
+-reporter_rhtsupport_SOURCES = \
+-    abrt_rh_support.h abrt_rh_support.c \
+-    reporter-rhtsupport.h \
+-    reporter-rhtsupport-parse.c \
+-    reporter-rhtsupport.c
+-reporter_rhtsupport_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DBIN_DIR=\"$(bindir)\" \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    -DLOCALSTATEDIR='"$(localstatedir)"' \
+-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+-    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+-    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
+-    $(LIBXML_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_rhtsupport_LDFLAGS = -ltar
+-reporter_rhtsupport_LDADD = \
+-    $(GLIB_LIBS) \
+-    $(LIBXML_LIBS) \
+-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
+-    ../lib/libreport-web.la \
+-    ../lib/libreport.la
+-
+ reporter_upload_SOURCES = \
+     reporter-upload.c
+ reporter_upload_CPPFLAGS = \
+@@ -200,16 +135,4 @@ report_CPPFLAGS = \
+ report_LDADD = \
+     ../lib/libreport.la
+ 
+-reporter_ureport_SOURCES = \
+-    ureport.c
+-reporter_ureport_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_ureport_LDADD = \
+-    ../lib/libreport.la \
+-    ../lib/libreport-web.la
+-
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
+index 18eba5a..f5afe6f 100644
+--- a/src/plugins/bugzilla.conf
+++ b/src/plugins/bugzilla.conf
+@@ -1,5 +1,5 @@
+ # Bugzilla URL
+-BugzillaURL = https://bugzilla.redhat.com/
+BugzillaURL = https://bugs.gentoo.org/
+ # yes means that ssl certificates will be checked
+ SSLVerify = yes
+ # your login has to exist, if you don have any, please create one
+diff --git a/src/plugins/mailx_event.conf b/src/plugins/mailx_event.conf
+index a8c5d11..1c07a73 100644
+--- a/src/plugins/mailx_event.conf
+++ b/src/plugins/mailx_event.conf
+@@ -1,3 +1,3 @@
+-EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
+# EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
+ 
+ EVENT=report_Mailx      reporter-mailx
+diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf
+index f1a77f5..bb2e651 100644
+--- a/src/plugins/report_Bugzilla.conf
+++ b/src/plugins/report_Bugzilla.conf
+@@ -1,4 +1,4 @@
+-Bugzilla_BugzillaURL = https://bugzilla.redhat.com
+Bugzilla_BugzillaURL = https://bugs.gentoo.org/
+ Bugzilla_Login =
+ Bugzilla_Password =
+ Bugzilla_SSLVerify = yes
+diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
+index 8151d32..acaf7fb 100644
+--- a/src/plugins/report_Bugzilla.xml.in
+++ b/src/plugins/report_Bugzilla.xml.in
+@@ -16,8 +16,8 @@
+             <_label>Bugzilla URL</_label>
+             <allow-empty>no</allow-empty>
+             <_description>Address of Bugzilla server</_description>
+-            <default-value>https://bugzilla.redhat.com</default-value>
+-            <_note-html>You can create bugzilla.redhat.com account &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
+            <default-value>https://bugs.gentoo.org/</default-value>
+            <_note-html>You can create bugs.gentoo.org account &lt;a href="https://bugs.gentoo.org/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
+         </option>
+         <option type="text" name="Bugzilla_Login">
+             <_label>User name</_label>
+diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
+index a3e8855..17a686d 100644
+--- a/src/plugins/reporter-bugzilla.c
+++ b/src/plugins/reporter-bugzilla.c
+@@ -34,7 +34,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_h *settings)
+     environ = getenv("Bugzilla_BugzillaURL");
+     b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL");
+     if (!b->b_bugzilla_url[0])
+-        b->b_bugzilla_url = "https://bugzilla.redhat.com";
+        b->b_bugzilla_url = "https://bugs.gentoo.org/";
+     b->b_bugzilla_xmlrpc = xasprintf("%s"XML_RPC_SUFFIX, b->b_bugzilla_url);
+ 
+     environ = getenv("Bugzilla_SSLVerify");
+diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py
+index 9c5e6b3..7188392 100644
+--- a/src/report-python/__init__.py
+++ b/src/report-python/__init__.py
+@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, NewtIO
+ 
+ import os
+ 
+-SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"]
+-SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"]
+SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/gentoo-release"]
+SYSTEM_RELEASE_DEPS = ["system-release", "gentoo-release"]
+ 
+ _hardcoded_default_product = ""
+ _hardcoded_default_version = ""
+-- 
+1.7.12
+
--- a/dev-libs/libreport/libreport-2.0.13.ebuild
+++ b/dev-libs/libreport/libreport-2.0.13.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.13.ebuild,v 1.1 2012/09/22 20:12:48 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+inherit autotools eutils python user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/btparser-0.18
+	>=dev-libs/glib-2.21:2
+	dev-libs/json-c
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt
+	dev-libs/nss
+	dev-libs/xmlrpc-c
+	net-libs/libproxy
+	net-misc/curl[ssl]
+	sys-apps/dbus
+	>=x11-libs/gtk+-3.3.12:3
+	x11-misc/xdg-utils"
+RDEPEND="${COMMON_DEPEND}
+	|| ( gnome-base/gnome-keyring >=kde-base/kwalletd-4.8 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Replace redhat- and fedora-specific defaults with gentoo ones, and disable
+	# code that requires gentoo infra support.
+	epatch "${FILESDIR}/${PN}-2.0.13-gentoo.patch"
+
+	# Modify uploader_event so that the gui recognizes it
+	epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
+
+	# automake-1.12
+	epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch"
+
+	python_clean_py-compile_files
+
+	mkdir -p m4
+	eautoreconf
+}
+
+src_configure() {
+	ECONF="--disable-bodhi
+		--localstatedir=${EPREFIX}/var"
+	# --disable-debug enables debug!
+	use debug && ECONF="${ECONF} --enable-debug"
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
+
+pkg_postinst() {
+	python_mod_optimize report reportclient
+}
+
+pkg_postrm() {
+	python_mod_cleanup report reportclient
+}
--- a/dev-libs/libwacom/libwacom-0.6.ebuild
+++ b/dev-libs/libwacom/libwacom-0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.6.ebuild,v 1.1 2012/09/15 09:44:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.6.ebuild,v 1.3 2012/09/23 06:22:14 blueness Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc static-libs"

 RDEPEND="dev-libs/glib:2
--- a/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch
@ -0,0 +1,26 @@
+From 4514fed897ab0911097e54715e7936048bf43dd9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 16:37:36 -0400
+Subject: [PATCH] Gentoo uses /usr/bin/python-config with automatic version
+ detection
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 0d7ba86..3c8a5ad 100644
+--- a/configure.in
+++ b/configure.in
+@@ -353,7 +353,7 @@ except: print 0"`
+ 		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
+ 	    fi
+ 	fi
+-        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
+        PYTHON_LIBS=`python-config --libs`
+     fi
+     if test "$with_python" != ""
+     then
+-- 
+1.7.12
+
--- a/dev-libs/libxslt/files/libxslt-1.1.27-python-includes.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.27-python-includes.patch
@ -0,0 +1,48 @@
+From d690cf1ee8f61eb86a9bd6f21aa5aea8a7b4d2a3 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 17:44:32 -0400
+Subject: [PATCH] Fix python build by using libxsltmod_la_CPPFLAGS instead of
+ AM_CPPFLAGS
+
+Commit a2cd8a03 broke the --with-python build by moving includes from
+INCLUDES to AM_CPPFLAGS. AM_CPPFLAGS gets ignored when a target-specific
+*_CPPFLAGS variable exists, but at least some automake versions
+automatically add "libxsltmod_la_CPPFLAGS = -shared" to python/Makefile.in
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684637
+---
+ python/Makefile.am | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 48a6c6e..6869c2b 100644
+--- a/python/Makefile.am
+++ b/python/Makefile.am
+@@ -3,12 +3,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+ SUBDIRS= . tests
+ 
+-AM_CPPFLAGS = \
+-	-I$(PYTHON_INCLUDES) \
+-	-I$(top_srcdir)/libxslt \
+-	-I$(top_srcdir) \
+-	-I../libexslt
+-
+ AM_CFLAGS = $(LIBXML_CFLAGS)
+ 
+ DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
+@@ -36,6 +30,11 @@ all-local: libxslt.py
+ 
+ python_LTLIBRARIES = libxsltmod.la
+ 
+libxsltmod_la_CPPFLAGS += \
+	-I$(PYTHON_INCLUDES) \
+	-I$(top_srcdir)/libxslt \
+	-I$(top_srcdir) \
+	-I../libexslt
+ libxsltmod_la_SOURCES = libxslt.c types.c
+ nodist_libxsltmod_la_SOURCES = libxslt-py.c
+ libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
+-- 
+1.7.12
+
--- a/dev-libs/libxslt/libxslt-1.1.27.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.27.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.27.ebuild,v 1.1 2012/09/22 14:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.27.ebuild,v 1.2 2012/09/22 21:56:30 tetromino Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -35,8 +35,14 @@ src_prepare() {

 	epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch

+	# Use python-config, not python2.7-config
+	epatch "${FILESDIR}/${PN}-1.1.27-python-config.patch"
+
+	# bug #435900, https://bugzilla.gnome.org/show_bug.cgi?id=684637
+	epatch "${FILESDIR}/${P}-python-includes.patch"
+
 	# Python bindings are built/tested/installed manually.
-	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed"
+	sed -e 's/$(PYTHON_SUBDIR)//' -i Makefile.am || die "sed failed"

 	eautoreconf
 	epunt_cxx
--- a/dev-libs/opensc/opensc-0.12.2-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.5 2012/09/12 00:34:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.6 2012/09/23 08:11:40 phajdan.jr Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc libtool +pcsc-lite openct readline ssl zlib"

 RDEPEND="libtool? ( sys-devel/libtool )
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@ -1,3 +1,2 @@
 DIST totem-pl-parser-2.32.6.tar.xz 1438372 SHA256 8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874 SHA512 25726fd95815955b5f8b6fc35cc906f9dcd3818a17f0113e8fcc3240b4fadbaabfcfe91d463ef2d69062cd19a9b6a665342a14a88d781ab70929ac40add07ac3 WHIRLPOOL 1e924e1ff461aac1259a3cd10cefe8b11dbf59f8a676004f5023abb5da623bed520c07937ea802f619a9a33f47a47f2014cbd5ed5795befe35abc8e1bc8986e9
-DIST totem-pl-parser-3.4.2.tar.xz 1452392 SHA256 7b336f599610898beca8238408c9c8e1f1f264602cefb2d1f5601acf9a261ecd SHA512 61c3522e0611ca7d3f57f69f743a49a8cdfcb6f57bc087e3e17b1e8e82a7c43e8ee6d4c13007a3e2286df23c264effec2e2a8771255abd5434be0238e774b1a0 WHIRLPOOL 8db6bd24d3282840df0f4fc3d6aed51cf76cff4f7d9f86413742d7226ec8d763238deaed7b7c5d6dbb0e637e4e2ed683f9b3c8fff3e8aaeae58d85196c9370c6
 DIST totem-pl-parser-3.4.3.tar.xz 1602000 SHA256 ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b SHA512 19ecc0aab4ce486cfbe5bd6390467fb1e14279708aaeb831f8626f7350c8b8deaa59157f95f746cfd4ac8d87a496977f558fce605bed4647f877d05dc0b0ebe6 WHIRLPOOL 7b1e654dc96e07d690309662d039cacd71c6ddc9d4856f4819be33024db02ddbd88a3d87e43ee486716f9c58256cd61a701c99d541d996085c1405dc7df15f40
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild,v 1.7 2012/09/18 10:14:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r2.ebuild,v 1.1 2012/09/22 17:45:37 pacho Exp $

 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"

-inherit gnome2
+inherit eutils gnome2

 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
@ -16,15 +16,15 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"

 RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
+	dev-libs/gmime:2.6
 	>=net-libs/libsoup-gnome-2.30:2.4
 	archive? ( >=app-arch/libarchive-2.8.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/quvi-0.2.15 )"
+	quvi? ( >=media-libs/libquvi-0.2.15 )"
 DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
 	>=sys-devel/gettext-0.17
@ -54,6 +54,9 @@ pkg_setup() {
 #}

 src_prepare() {
+	# bug #386651, https://bugzilla.gnome.org/show_bug.cgi?id=661451
+	epatch "${FILESDIR}/${PN}-2.32.6-quvi-0.4.patch"
+
 	gnome2_src_prepare

 	# Disable tests requiring network access, bug #346127
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild,v 1.3 2012/09/18 10:14:04 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive crypt doc +introspection +quvi test"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	dev-libs/gmime:2.4
-	>=net-libs/libsoup-gnome-2.30:2.4
-	archive? ( >=app-arch/libarchive-2.8.4 )
-	crypt? ( dev-libs/libgcrypt )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/libquvi-0.2.15 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.14
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-maintainer-mode
-		$(use_enable archive libarchive)
-		$(use_enable crypt libgcrypt)
-		$(use_enable quvi)
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-# eautoreconf needs:
-#src_unpack() {
-#	# If gobject-introspection is installed, we don't need the extra .m4
-#	if has_version "dev-libs/gobject-introspection"; then
-#		unpack ${P}.tar.bz2
-#	else
-#		unpack ${A}
-#	fi
-#}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
-}
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@ -1,3 +1,4 @@
 DIST perl-ldap-0.4001.tar.gz 254232 SHA256 fae2cf183b6b214ee904eea854ea84ba54b13ce28d8ea6d62f70760f4e8bfc6a SHA512 e4fe781f1d4c4a2b6365be4ff7a44ac8e7d96f0f5544281d6baaeaef4dbd173c77424fc105dbf61c6a2fbf9deff34cf08b470773ac34b83aca878a58fe2467de WHIRLPOOL bb1f29e73a4c5247d4896b5070c5f12a687796a9018fbc77aac3309c1c6842c12d751cf67e4eeb85e6318764109e605d7d3097cb6ffc1f46653c2b7e14cc7c1c
 DIST perl-ldap-0.44.tar.gz 262973 SHA256 6c398f32bf598ee139d111b5fd91cda1e77ca0fb3a57e9616909efdec5d4cacb SHA512 7a2bc4f7c4d2957c1e3eb24451687625e2ba5044818c34d2fe59162ea34a5218e3da4a8e01a5024c6dedf393733238a802436f6b9a0d884a59c520c6061d7e81 WHIRLPOOL 5c62e8c9affad750c142133c3cc875b84172d7afa6b1b92151f4bcc178520c143a11e397c7ab9a336e082d8880804d8c246ef3af292fe9635c1ebde5c1821b8b
 DIST perl-ldap-0.46.tar.gz 263688 SHA256 1a89b35515b1ff114ebcef1194be9c7599a3856ad3cfdc43970f38739d432f5c SHA512 40c9466b3d27601a1c0c5918c8b35e23952f630731407de53b2421585e0ab7ad7c0db4fbfdf6e9ddb5ab11e7bf99d91f99af4af8adbc47aab76c0227918bacc1 WHIRLPOOL 4f9f483be025f642101675fa96857ecc7315fe88b5514da1fb04efbef0b8eb73d2f03a6c14940689d77cba2cee8c635faa426bc921757ca9e701e30f0a207295
+DIST perl-ldap-0.48.tar.gz 265877 SHA256 773e0e421021a76b1eef43ff57e8481ca6fd690ba1157c64ac7b1cf29d2d49f3 SHA512 b894833c9d4c13336d216c0208626ff8ed0d028d2c1a5200593d4839b53a4ec7ce3c1b606a734f0dcd841dc131b189925db603fb5c9a19fe18bd61875be618c4 WHIRLPOOL 71bda604f8fd2539badc13ef64c456454032780b1a1cbf8ce929c6ce8069c9e0e0a97c76a70fd19472f822a1c3588966559921b8044b94580766de2c5f44bbc0
--- a/dev-perl/perl-ldap/metadata.xml
+++ b/dev-perl/perl-ldap/metadata.xml
@ -6,6 +6,7 @@
    <remote-id type="cpan">perl-ldap</remote-id>
    <remote-id type="cpan-module">Bundle::Net::LDAP</remote-id>
    <remote-id type="cpan-module">LWP::Protocol::ldap</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::ldapi</remote-id>
    <remote-id type="cpan-module">LWP::Protocol::ldaps</remote-id>
    <remote-id type="cpan-module">Net::LDAP</remote-id>
    <remote-id type="cpan-module">Net::LDAP::ASN</remote-id>
--- a/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild,v 1.1 2012/09/23 08:26:36 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=MARSCHAP
+MODULE_VERSION=0.48
+inherit perl-module
+
+DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="sasl xml ssl"
+
+RDEPEND="
+	dev-perl/Convert-ASN1
+	dev-perl/URI
+	sasl? (
+		virtual/perl-Digest-MD5
+		dev-perl/Authen-SASL
+	)
+	xml? (
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-SAX-Writer
+	)
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-1.26
+	)"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@ -1,2 +1,3 @@
+DIST netaddr-0.7.10.tar.gz 1313043 SHA256 9b79763141a855079b0589717696a4ccb5c56c0b807b6e584bfe12333399e0b7 SHA512 28d51e81151c96df37adf3466de451fc7375624eee6cd4b5d5587c25fd82d23b2dbba0fac38938ca760b28e220fbf147d2e5fa326869b2500de036bf02b042ab WHIRLPOOL 5a57518a57ca4ea803ba3bb6537e58cc256b2972c76f78d196dd042a98aeedb47c171857a4633e3696f8697123384ecd2c83323abfd5b86249098721d726c359
 DIST netaddr-0.7.6.tar.gz 1211697 SHA256 d8abb9e2fdf17e8ff3e238a8e175a3f34e8fce3ec1bee899c81eb47b377e4d72 SHA512 da410c612359e20227c14b60a70a45ee5020d3ec2ecfd388423ee0a0a694e5b62b202469fced536a5a1c7a6d335bc9eeb27eb3da067818aa9db33a0da538775a WHIRLPOOL e2e03892349835085c88eb23c73bea33f8c9af049e8ca1313727b37e582ff7688aead5c35d33a821a8bb2ebac32ff6b754ba480431fdf2c76cbedafc4633d670
 DIST netaddr-0.7.7.tar.gz 1303385 SHA256 64bb6ad22b4d715ae94d67bc0c9f5ddd1ce2cd071c29bcaa77fd5f9d3ceb81c7 SHA512 17a5ddc4c4631a3d66268d4f8463cde7d60ee56c3b960cf733c30e80b3705f938890445e2c50db112eb8e226c0254b985fd0f597f3b728c772712f3a1d8bad8e WHIRLPOOL e33831fd48c68362549c681bfdd5458bd0102abece1426ba731d3cda198854889655b51153d0f3b7a98998182c7280c3a01d11ab19adda4276a445f9fd7bfb3c
--- a/dev-python/netaddr/netaddr-0.7.10.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.10.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.10.ebuild,v 1.1 2012/09/22 18:49:38 maksbotan Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
+
+inherit distutils
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr http://pypi.python.org/pypi/netaddr"
+SRC_URI="mirror://github/drkjam/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli"
+
+DEPEND=""
+RDEPEND="cli? ( dev-python/ipython )"
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" netaddr/tests/__init__.py
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	if ! use cli; then
+		ewarn "If you intend to use netaddr shell in terminal, enable cli USE flag"
+	fi
+}
--- a/dev-python/pylibacl/pylibacl-0.5.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/pylibacl-0.5.0.ebuild,v 1.9 2012/02/22 09:08:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/pylibacl-0.5.0.ebuild,v 1.10 2012/09/23 04:27:22 mattst88 Exp $

 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""

 RDEPEND="sys-apps/acl"
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@ -1,5 +1,3 @@
-DIST simplejson-2.3.0.tar.gz 50034 SHA256 dc026631646d32fda40be754484c67918617db37f517547462aa58ae5d159d34 SHA512 5b131b28a388f7f4b8136e51c110b15a1f3b6a7db7d445335e0b0e08bf3f241a9e287add2180be4c6b28a2215ea6cdd14a855189f6873729f462e5457b8fabdd WHIRLPOOL e0ede2298ea9ae408c2d3e91e1c8f4f8d84690004ffa71573afb3b5310ab4a00654d0d984ed6163f2f9ba07beaded7d1f2ff1dfbf92f6fcb8a7aaf7f6b8b132a
-DIST simplejson-2.5.0.tar.gz 52834 SHA256 2bcf5bedb5328a5633045a7d46784d3393ce940c949c090caf5d75b6d3163466 SHA512 d50a667cbcf0de1e07652557c03c58829eb68b85899bb412c359cee454fe57e2055e5460f67830d2699a4069f6fb765f945f44a47d74318b43aa369ffb093c28 WHIRLPOOL f04c021a41221ce6dcb095042ed388763f390d7572c5729771af8da45da1b77005125a333591bbd553c6bdfebd95814556735e961cdb7b858cc02c108f1f2b2d
-DIST simplejson-2.5.2.tar.gz 53009 SHA256 196dbf614facc5f3e650cc38a18ab64c2df0b502ecf217cbd1c9d840133e70a4 SHA512 e2ed942aca32caa1a8a5a272a6208701a1617ba3b27870a2580e44f20221b8e938cb7d092088a261d2a3b120841ad9aa0a89bb1b984975360c22ae3c13e99edf WHIRLPOOL bf2cc643df9d45ecb08c113d946629b10410982cc388a87148de75d436e3b5353a36a51386d27610d33230ba0163def3b6ea3fe2b04d3f6510f634420b5f91af
 DIST simplejson-2.6.0.tar.gz 53012 SHA256 8119b9bfb10b9ca3b0b63f8555b8efd114595ff01ba2d1c34c8aaf91e7d0badc SHA512 44ffaa289ced95f4c9fa2431243020a0fb915d2fea6afc7cf4507c6909c7a647bb6d42afe12ee077d18b92ae900c7eb54955ee6ab6e331297e6edced0d549f6b WHIRLPOOL 7490998b428b205e22ba45d7428a0439bafe803fca82e97450990b9fbce8a0a4b8f2e60e9b42037695522a67b32baef1915b2289b10e9e00ac576fbc1aaa493f
 DIST simplejson-2.6.1.tar.gz 53180 SHA256 b15befbd41157ec21795efcd960828be193cec6334b3e94bb99e02b32daad17c SHA512 ceb8df15bf7321197a3fc48fe594376fb226eff8ccc37bb695bec45f19dd0fb7baef2d764ee964e58254ade1d154c50a746cf2f8a9e85ef9922f52c15e2dc4a2 WHIRLPOOL 95606ae04d4f283650241c09b665f6f661be34351e60a9feec6e67181eabb76ccda6b86b46b75e8069ec7ff946edd377c80837f32751cf1593ce364d2b552aa1
+DIST simplejson-2.6.2.tar.gz 53228 SHA256 1b28d0896a76d4db1ab759204c039ab1ca4bf28bd30d6bf9c79172454e750dd3 SHA512 58dc99952507562d22aab8cfeb2480a9fea1422ebc588bffd148ac1579be4ef7f03ec1bafab4339447dd56c566a28132011f51a5d44584ae7b46762e61e4ac7b WHIRLPOOL c45f19b234dde5daae05659032c5ce8be39471a014abd2a11cb9d2a0f5f912010887e64e7be0761f59c04ffe73ecb3b308fd13ae30da9c1853150ad878e9c0e4
--- a/dev-python/simplejson/simplejson-2.3.0.ebuild
+++ b/dev-python/simplejson/simplejson-2.3.0.ebuild
@ -1,43 +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/simplejson/simplejson-2.3.0.ebuild,v 1.5 2012/03/02 19:38:23 maekke Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_test() {
-	testing() {
-		if [[ "$(python_get_implementation)" != "Jython" ]]; then
-			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || return 1
-		fi
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" simplejson/tests/__init__.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/simplejson/tests"
-	}
-	python_execute_function -q delete_tests
-}
--- a/dev-python/simplejson/simplejson-2.5.0.ebuild
+++ b/dev-python/simplejson/simplejson-2.5.0.ebuild
@ -1,43 +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/simplejson/simplejson-2.5.0.ebuild,v 1.5 2012/05/29 19:58:34 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_test() {
-	testing() {
-		if [[ "$(python_get_implementation)" != "Jython" ]]; then
-			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || return 1
-		fi
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" simplejson/tests/__init__.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/simplejson/tests"
-	}
-	python_execute_function -q delete_tests
-}
--- a/dev-python/simplejson/simplejson-2.6.2.ebuild
+++ b/dev-python/simplejson/simplejson-2.6.2.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.5.2.ebuild,v 1.1 2012/05/21 07:16:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.2.ebuild,v 1.1 2012/09/23 03:45:31 radhermit Exp $

-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
@ -18,15 +18,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""

-DEPEND=""
-RDEPEND=""
-
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")

 src_test() {
 	testing() {
 		if [[ "$(python_get_implementation)" != "Jython" ]]; then
-			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || return 1
+			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || die
 		fi
 		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" simplejson/tests/__init__.py
 	}
--- a/dev-python/urwid/urwid-1.0.2.ebuild
+++ b/dev-python/urwid/urwid-1.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.4 2012/09/12 02:09:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.5 2012/09/23 08:11:05 phajdan.jr Exp $

 EAPI="4"
 PYTHON_USE_WITH="ncurses"
@ -17,7 +17,7 @@ SRC_URI="http://excess.org/urwid/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="examples"

 DEPEND="dev-python/setuptools"
--- a/dev-ruby/bundler/bundler-1.0.22.ebuild
+++ b/dev-ruby/bundler/bundler-1.0.22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.22.ebuild,v 1.3 2012/05/01 18:24:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.22.ebuild,v 1.4 2012/09/23 08:28:32 phajdan.jr Exp $

 EAPI=2

@ -21,7 +21,7 @@ HOMEPAGE="http://github.com/carlhuda/bundler"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 ruby_add_rdepend virtual/rubygems
--- a/dev-ruby/origin/Manifest
+++ b/dev-ruby/origin/Manifest
@ -1 +1 @@
-DIST origin-1.0.8.tar.gz 35939 SHA256 e0d244c881add7c9d70ae64157b89cecf0830b88ca5bec5836f7a5f186f2be24 SHA512 737d7e6dc02c2fab16abf97644a2ca676948bab7d94fd8de74f98cc8d9cc8f290a041a971aca20494b0ab3b257fd2e093e1b23fe1fccb0207be551261622af76 WHIRLPOOL f8d89d9cbb975e21a194303c39b65dba645301cf8ab2d20e53ff3543661badc4bd6f04d077fe2a4680e1b09080f964ed69bef018026b318999b51979265a6dd4
+DIST origin-1.0.9.tar.gz 36452 SHA256 b83faab05539fa2a76ce2ce948ba410b9fef330543e5608f7b419d061373b019 SHA512 4ae18506e0230a7667232e7d8fe86560f927627ebb339bb6b1b63763b7622fd6690c10530ac592fc9b206cf76d17bfc8de7d1196c386a1a69b17cbfa8cccb6c7 WHIRLPOOL 5f8636dcbfd685ab165401c532a25507544d57ea7a22281e01c5a635efac52837debecadb9140bb2504d900088d139d516f70a4a44a0253a27dd26cf578ef3e1
--- a/dev-ruby/origin/origin-1.0.9.ebuild
+++ b/dev-ruby/origin/origin-1.0.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/origin/origin-1.0.8.ebuild,v 1.1 2012/09/01 12:54:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/origin/origin-1.0.9.ebuild,v 1.1 2012/09/23 03:54:52 flameeyes Exp $

 EAPI=4

--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@ -1,3 +1,2 @@
 DIST serialport-1.0.3.gem 22528 SHA256 d8e3d771e343491aba18cc00a6eecc2e592ddb0d6048c079cff005894dc04e7e SHA512 63cf50ff43bed2f29328f2ede261c32015881a059c893ee77d206b969a875c22d19e94b445e93afeb3905aa91e7a59e072947e5b39f224dd15cb8a38c5dc8964 WHIRLPOOL ba52fc83b5ae9b0150145916bbcefc83eeca44663056b955974e6d07a3aefa469b2fb59e5a4e22ae1bc00f96a3989c1f1f638d75e72d43080de0c7213510b640
-DIST serialport-1.0.4.gem 23552 SHA256 620a0d9e063e39dbcd378c9868a7ac83525848b3dafb2767652abf4b550eef4d SHA512 485b188483416bd9c9861d746f3c86c08ea204d18e27a6d2f16fc0fcb1ec8490ad6072b33384437ad79579bebba3ec92abd7bbef497e22275f8b4336ec7cf592 WHIRLPOOL a4c1c364ad05e02da44664fdb21397c7c9441d1aa8ff86d283842c83ef14579e4a1228ed3c3b166b268fbdc630c08f40803343a27edca2a89101614025070c4f
 DIST serialport-1.1.0.gem 23552 SHA256 bfecc6462b721eb07817739ab8ae913b90ca567b16334c9893e8643ece8d234b SHA512 6092fe12725b7a75a26c06414dd9d3368797b07060d5271138eeb6657a6d0c967f356036787e11b83e8b8a30a1ab75125edee55593710cf7ab2ab16c2cb9b42a WHIRLPOOL 4c6bb5a9a47bdfdaffec8e91ef621f9df9ca48fd07f1e8cf61527e211af86d4428f1b86570344e994cbb07aecca881058a8dab3317774c79043380bf39f9be7d
--- a/dev-ruby/serialport/serialport-1.0.4.ebuild
+++ b/dev-ruby/serialport/serialport-1.0.4.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/serialport/serialport-1.0.4.ebuild,v 1.2 2012/05/01 18:24:16 armin76 Exp $
-
-EAPI="2"
-
-# jruby → uses native library
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a library for serial port (rs232) access in ruby"
-HOMEPAGE="http://rubyforge.org/projects/ruby-serialport/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Fix the miniterm script so that it might actually work, we'll
-	# install it as example.
-	sed -i -e 's:\.\./serialport.so:serialport:' test/miniterm.rb || die
-}
-
-each_ruby_configure() {
-	cd ext/native
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	pushd ext/native &>/dev/null
-	emake || die
-	popd &>/dev/null
-
-	# Avoids the need for a specific install phase
-	cp ext/native/*.so lib/ || die "extension copy failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# don't compress it
-	insinto /usr/share/doc/${PF}/examples
-	doins test/miniterm.rb || die
-}
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@ -1,2 +1,3 @@
 DIST sexp_processor-3.0.5.gem 14848 SHA256 8e06c84ed3a0159a0f2e6f7b10bbd056954ac2d33548318ccc3088556c8a8891 SHA512 b81de61a5f47e1832688361c195eddac1bc380828b00300e56a6323a1efd1358498feae396ec3c5858412be4411ce57dfb2c647df64b2ac2cf8865e5e4e6dea5 WHIRLPOOL d5797d9773801e35d04b81fb8ff36e1f2afa3cb895e902b12166020c50ed0440819992f78d95d049e3960c61b5b4b465321688d23cf526d9b7f2628a65c8fefa
 DIST sexp_processor-3.2.0.gem 35328 SHA256 5951f8d33ede2f68686c701142c6cc1004d6f525b0aa8e8279a1bf075542b0f0 SHA512 1a0330dcccf36ededcba07f0dccecb9964277c82541b66c416f3fc6513da3a785597f22115f7434a0a95401a334740620a734e1a6f71b73b4f0152c88b641c2c WHIRLPOOL 47f7256ffa199d862068886493ec95487ebe6003f60f6c66d16f99e7a9659bed7538d5bc2b2c5966dbfd33defd55eba6ccbf723a0cad4bfdf0519599aa1124c8
+DIST sexp_processor-4.0.1.gem 34816 SHA256 efd33857c0f41a413ec3ea20251f43c4826fe8a11b01099335f4a3b6777eb727 SHA512 281716fdc183bc7a7b26ae2ab7ca1cbe99a2437e97dce0346e0c0a37f0d0dedf5acc1097dd44dd241f3136aecff4b7a6ad4b4f7c12736400cfe3d8569b3b739a WHIRLPOOL aa05d13a4678a86ccf05786553ae81d56ccbf5500e09d9343fc71f7aabc75d895bdcca96f09ffd0c011be66adba35256c99106f59d57f8e8d5744eb3d22feedc
--- a/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild,v 1.1 2012/09/23 06:47:51 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project."
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/hoe
+		dev-ruby/hoe-seattlerb
+		dev-ruby/minitest
+	)"
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@ -1,2 +1 @@
-DIST sfl-2.1.gem 7680 SHA256 a9af09e76d55fb4a7feb03fe69ca03f19e278987c7ad38de12c03ea706a9f028 SHA512 0c7dd6053bc32b559e42851cb0fd657c8bdf29745d944ce17436138f91a916ac04e010c1cc7109ce482bdf335917c1bc7141f15781630007633d3a0ce5bd51ce WHIRLPOOL bfa61f1bbe6abccc81fe8f755529243c4d034c0497b463f1de36c1083906b0f0b3dc8a9a37378adf9e3f786ab82bf69584539c4cb842652e5dd7e6b9abcde07e
 DIST sfl-2.2.gem 8192 SHA256 323cbf7d9af865dc2bd3fd5f4181798e24a07f02f7b1f935e915f5edd7f4072b SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932 WHIRLPOOL f8a6509646c47ccef6aa064f27019fe7113df36f861456e87262665ef54eb240d4b2b1f3eb7ff5d1aa4d3dad849ee413f8e27ce64675b011ab511fa0b33774ce
--- a/dev-ruby/sfl/sfl-2.1.ebuild
+++ b/dev-ruby/sfl/sfl-2.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sfl/sfl-2.1.ebuild,v 1.4 2012/07/05 22:42:21 flameeyes Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library provides spawn() which is almost perfectly compatible with ruby 1.9's."
-HOMEPAGE="https://github.com/ujihisa/spawn-for-legacy"
-
-LICENSE="|| ( Ruby BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "s:/tmp:${TMPDIR}:" spec/sfl_spec.rb || die
-}
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@ -1,2 +1 @@
-DIST shotgun-0.8.gem 14336 SHA256 8f04337bb4181342188dfe57570becb882d0197e1a18af047820568bb339fc54 SHA512 f653c5907ccdb0acd6be71a9ecfa042ffa83b4ce7167a807f308b905f888b04d952ab32e6e4a5668c8c42b1a78d0c5654cb90ee7fcb77b22c53720d7f8f2d31c WHIRLPOOL 68db26f33b4cb332f85a26ec38532f1c6bedec1d3c3fafef308b43c434d7920200be4330da84fedfaad0fce2950f7ae90e8bbb78f315c490c3b712f8cd6d2805
 DIST shotgun-0.9.gem 14336 SHA256 5518285ff9494a36841345985857fb848aeab9981bc2c0d964f08c10315045a5 SHA512 55bc886df596606db9324da4441e3b9585355dedeca0e135b50c52a46640efa83dd378b5e86b35d631b51c4ad8839313809d88932282447b30a23a9bf2827196 WHIRLPOOL 15cecfacdb7b2d6fbdb5982915e37f4eeb48fec5b95f05e84464b23f31623658a5da85f2142f671d5312f47e0d67a95e536db2e6ef3ead29b0d005797adf3274
--- a/dev-ruby/shotgun/shotgun-0.8.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.8.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.8.ebuild,v 1.2 2011/01/22 16:38:07 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Forking implementation of rackup"
-HOMEPAGE="http://rtomayko.github.com/shotgun/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Warning: the code does not use gem versioning to make sure to load
-# only the right rack version so we might need to patch it to work :/
-ruby_add_rdepend 'dev-ruby/rack'
-ruby_add_bdepend test dev-ruby/bacon
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/shotgun.1
-}
--- a/dev-ruby/shotgun/shotgun-0.9.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.9.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.9.ebuild,v 1.1 2011/02/25 07:13:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shotgun/shotgun-0.9.ebuild,v 1.2 2012/09/23 06:51:57 graaff Exp $

-EAPI=2
-USE_RUBY="ruby18 ree18"
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"

 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
@ -23,7 +23,7 @@ IUSE=""
 # Warning: the code does not use gem versioning to make sure to load
 # only the right rack version so we might need to patch it to work :/
 ruby_add_rdepend 'dev-ruby/rack'
-ruby_add_bdepend test dev-ruby/bacon
+ruby_add_bdepend "test? ( dev-ruby/bacon )"

 all_ruby_install() {
 	all_fakegem_install
--- a/dev-ruby/simple_oauth/Manifest
+++ b/dev-ruby/simple_oauth/Manifest
@ -1,3 +1 @@
-DIST simple_oauth-0.1.5.gem 11776 SHA256 ae56cc3f8f5c3aad5a722fb77ef69bf69b994d6170f0671ba784c85dcd641568 SHA512 7df8db14c30f63bc9d2bcf14af70793c1323eee2d910690957f6ed0d8c7db85e67f2b1c01d27537bc6531855c46f7b13f28098ed891299ae004727b37d8f6b80 WHIRLPOOL 3e3437cde1349e6ec58667462b5fb9d0c7e4bb3527d72d209c9611416dd24b98d0f4a4e33830977301edf77ed00311e30e2221fbe953b68dba1708a59b9931be
-DIST simple_oauth-0.1.8.gem 11264 SHA256 72cadcffdd3afd2eef38f9ea801092e41ffb990fa65bb32d6cd4925cb181bd81 SHA512 09cb31875a979eaabb113c23b939af31cdbc05e0b8d4c7b739e0b62d46248286c94dc73572f8003d7d7a14bc4357ba753ddca90ee1cf4887a2218ea5b51c2a0e WHIRLPOOL 99cccbaef794a3d25712d84b7083ff8eec4e78c645bfc61780644b94f1b1ae4d8dfe2adfbe7a5732bd9ead88928130ca02c7c104a130ea183eaad0b3284bbc85
 DIST simple_oauth-0.1.9.gem 11264 SHA256 723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d SHA512 ebb5e82c56033dcd85b73e7a47fb7d764b8f864d15cd09091a1e2216257a9aeb9bd974da7777f220ea6f50110a9e99207b9c51a26d27b53aae1ee06585ec0de7 WHIRLPOOL ed2320c789ac5f0a09c70d7a4bc36d6c1e4ab267902e4f4a4f9a53b9392648bbe8b839ec4a2fcc726d066e073228c5eed8727dd8b4cb19fe868ce6cbc4f9aac6
--- a/dev-ruby/simple_oauth/simple_oauth-0.1.5.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.1.5.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/simple_oauth-0.1.5.ebuild,v 1.2 2012/02/11 16:10:09 tomka Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc:yard"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simply builds and verifies OAuth headers."
-HOMEPAGE="https://github.com/laserlemon/simple_oauth"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( virtual/ruby-test-unit dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' -e '/[Ss]imple[Cc]ov/d' -e '/turn/d' Rakefile test/helper.rb || die
-}
--- a/dev-ruby/simple_oauth/simple_oauth-0.1.8.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.1.8.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/simple_oauth-0.1.8.ebuild,v 1.1 2012/06/09 07:00:10 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simply builds and verifies OAuth headers."
-HOMEPAGE="https://github.com/laserlemon/simple_oauth"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec spec || die
-}
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@ -1,3 +1,3 @@
 DIST sinatra-1.2.7.gem 246784 SHA256 5798f6400830308da34ac09cd321dd73402bf27c8fc77b92636634e609628195 SHA512 b4e3512c5b4d263b81012d6e5ee1cb6f29247480b7ecdcec66076fe1c3e971ed96a7800f5817767a3b4fd878f7ed09af7bf240a00465ed8d8609b65e29fc7a79 WHIRLPOOL 84a105030ffbd76b370e2f2b864ae36eb737376a7eab21488f3a6dbd7aa430a3d36e56ae13d9ac7dcc7b10816e27cb249c9db031cf83999843513a272207a179
-DIST sinatra-1.3.1.gem 273408 SHA256 7815776bf0bbc7f5729c12cfae504cd86304afe03985a17f3df1aa9ad461749b SHA512 6f04ad6299cfc6bb396ea686db7e11c23fa9df3bc41d1d606e2f4066e09e7ba8cf30b8d36375f6d350f00c3b1cda58ef08a1c1eed256abcab318552689358a70 WHIRLPOOL 7eb84e68e810b9d9047b9c97bcabb9f522fdf413ae9c07de39e212412da118f966fcacb8b5f2f4bd3fa17ab09344296f19354c160a10b7da117219c26cd32f48
 DIST sinatra-1.3.2.gem 276992 SHA256 ac6bc2e716ede58a2926ed0d4a3ef89db7561bcfc9b2a7cef73cde5f42727415 SHA512 d3ec42c2c19d28f7ff2de1a6d587339bbe2465f18d04f6b4e87e78e4ecdd0b2fccdbad0a44faba0a0440c5c4a715a40712f160f3d78f6e5d37acaa14867a908a WHIRLPOOL ab15c167bc06f20e71b471184d285cbe8e7aeda725510f48990c1586dbef660ec30f999073eed2a7fe4cc675a6e738ec811478b421bc92dfdaa7652302436305
+DIST sinatra-1.3.3.gem 306176 SHA256 ef027de9be93511b8b02ff8027c9d9a063f50d5615f3306ed6e0dbe69add8e63 SHA512 f481b0ba9656117e340a5d71f7880748b071652b7a1654137f619975be083c995d5c319013ab37b206abbcec51a74bf68330634c4f9e3eabcb48d673503261c8 WHIRLPOOL 3e8e0dc54fd5bcf77651d27d03aec3c51a1922c02c36b22f154b0c2311ecc6aa7be43a48e2966481392f095a5bd83e4501690c2292a3bfd02111d7129b092058
--- a/dev-ruby/sinatra/sinatra-1.3.3.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.3.3.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.1.ebuild,v 1.3 2012/03/11 14:13:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.3.ebuild,v 1.1 2012/09/23 07:04:51 graaff Exp $

-EAPI=2
+EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"

 # no documentation is generable, it needs hanna, which is broken
@ -17,12 +17,10 @@ HOMEPAGE="http://www.sinatrarb.com/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

-RUBY_PATCHES=( ${P}-rdoc-require.patch ${P}-rdoc-tests.patch )
-
-ruby_add_rdepend "=dev-ruby/rack-1* >=dev-ruby/rack-1.3.4
-	>=dev-ruby/rack-protection-1.1.2:1
+ruby_add_rdepend "=dev-ruby/rack-1* >=dev-ruby/rack-1.3.6
+	>=dev-ruby/rack-protection-1.2:1
 	=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.3"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 >=dev-ruby/haml-3.0 dev-ruby/erubis dev-ruby/builder )"
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@ -1,6 +1,3 @@
-DIST slop-2.4.2.tgz 20085 SHA256 235302ee07378f46c436a33adb62a7a1bb73ec35042a47b8152c46da0e84f76d SHA512 6b657bc92b9782df1fe2b78d49015d3dcf08526e61d6d3fb9c04d26cd7a5a96e1ed0eadbee57aa89c4e22f07a89d3283f9ded2e9b921016ec9323d8810192d31 WHIRLPOOL 91384f40d22e4fe94d90499de9d77f2fd5f2609640054483ffbecaf29298b4c1fd64e342fc032773c75117e532c55f09de8de656c4eaad9c9970a041ab45a3e0
 DIST slop-2.4.4.tgz 20420 SHA256 b5600dd1c63140d3b73a47695f1e1839ec992b77f16439c6ec0cdda84a9898c5 SHA512 3de90505f3091b6ec3c323e2b2562a5945e78b0ca46443a7a327c47f9efae4cd9deb09c1ff349eeaa399817fb5df0840e5e72229a2222deebb9a0473da02cccb WHIRLPOOL 28457e1c4ccb824404f5a97593f9fc8c132f63b55f29f932044e53669ad0c290d5524bf47f58d309eafdd0cb9b741a7c63d9e706dcf81d12df3c53297554ab7c
-DIST slop-3.0.2.tgz 15228 SHA256 f9f04503234f18ba2f0ee9761f1384f8689b93b3b760e77474757d2082b60a14 SHA512 1ff022a62cd344903497859285fc1e14453a99c10798f67563c75d5fe4e854da0f3ee6ac412baf9d3b5c0e23f2e14c52c28906a21850028b93b41d851557aae7 WHIRLPOOL 71fc7ec51d60d55393320663616c7e5a3a7e07bc68ef0cda37e43f507be81645becfe6c47998c23392ed86e1091cbd283e2b533e80884962420f2fa0fb0cfcc1
-DIST slop-3.0.4.tgz 15427 SHA256 02dc9a595b4ed794ffd3407cd647d683617d31438ef1e3dc47a27eba181440e7 SHA512 a9c1a79b0c6ee33bae08a6bb1855dd6b332d75d74d9ffeb848793b64f5e8def867ce37fb2a24c2e13816c19c8c57b4e5255d21c3cc620455f766e37fe7b70bcb WHIRLPOOL 2cbfe32760a5daecb9a7c5e2bf9667509b702386f97b447f0e3548d347cc95d884b7aa342e1793c3dc333bb4e4b1f7ae6920dfcd8c38993a0cb47bbed2d2fa4d
-DIST slop-3.3.1.tgz 16625 SHA256 baf226a89558163482b93573c37347697157a38e5d5aa58fd59b077ed82c2a2b SHA512 9feac9066c7ed3decc07cc3d5b7a8b2bd0841f218bdfbe8eb41e25ec117c881b8609704998dc7b06dcd9c778ad61132cfffac75913b42c040d36f1c4225505a7 WHIRLPOOL ad376d91ad8b47ef316910bf875bdd7d33bc501011681010e0065f4c66b2e2a7fb5d044d37cadfa7f5fe565d8f99b49bf86ce9ccea305bc80e2825a6031883f7
 DIST slop-3.3.2.tgz 16659 SHA256 428e124af7ec7dade758f65bd7ec5a074ed1cfc478db10e33fca0ae1f690ddb7 SHA512 b157b5877ba3c0307a34941a00df759d82a73cd009e61947571d025aeee1be17ae9af010ea84f89bcef9cbe852c3e8cffed62811f98ba468078cb7285728694e WHIRLPOOL 53c66bbb0d24efc21072d7ffaafd4a69b6606d518d5ac3d10d2004c45f87d50953aa2192c6bd27fe0a130a47e58e85e53db03e20226910ca2a490fa8096696cc
+DIST slop-3.3.3.tgz 17178 SHA256 2c32709a371b2ff5ed19a3bb3f776520620d4190c4c76019c0508b3c07f81cfe SHA512 3ec9c9444fa435f37e9cbf9d51077021bcfed87f2e3e86587165063f3ee146cd0c4c4d3c3a45126bcd2484fb18f0dacdc9ad2392779eb88d0320f40aca6e7059 WHIRLPOOL 9cfe7504390023da3e1ab45a6966cbc3ad35d7b4dfe1fc7fa7efdd611573bbff03b67884da954dc545c0316c8bafc5b31920e27b484412e575c903933f5c4aed
--- a/dev-ruby/slop/slop-2.4.2.ebuild
+++ b/dev-ruby/slop/slop-2.4.2.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/slop/slop-2.4.2.ebuild,v 1.1 2011/12/25 07:53:25 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API."
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/slop/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="injekt-slop-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
--- a/dev-ruby/slop/slop-3.0.2.ebuild
+++ b/dev-ruby/slop/slop-3.0.2.ebuild
@ -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/dev-ruby/slop/slop-3.0.2.ebuild,v 1.2 2012/03/11 12:54:25 ranger Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API."
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/slop/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="injekt-slop-*"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
--- a/dev-ruby/slop/slop-3.3.1.ebuild
+++ b/dev-ruby/slop/slop-3.3.1.ebuild
@ -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/dev-ruby/slop/slop-3.3.1.ebuild,v 1.1 2012/06/09 07:03:22 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API."
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/slop/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="injekt-slop-*"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
--- a/dev-ruby/slop/slop-3.3.3.ebuild
+++ b/dev-ruby/slop/slop-3.3.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/slop/slop-3.0.4.ebuild,v 1.2 2012/04/29 16:38:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/slop/slop-3.3.3.ebuild,v 1.1 2012/09/23 07:10:40 graaff Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@ -22,3 +22,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""

 ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec
+}
--- a/dev-ruby/snmplib/Manifest
+++ b/dev-ruby/snmplib/Manifest
@ -1,3 +1,2 @@
 DIST snmp-1.0.3.gem 167424 SHA256 bcb2d8e86196ffb86a570ca2b3cdb8a221756121ba61bd104a964c22c6209ece SHA512 1e24f0d434daa57c4def09ea28864af0650a639f7c0a06d9b7289a9528520010f255374f6624f127bb12d2ffd9991d3baad1165788188d9ba311a3f32783a73f WHIRLPOOL 795be29d653094902c05bcffb349bf6bfcc0973631e1965e2feb362d933e7e59fb8ad2858c9cf5ac23b04191d5c7f369d0ce187765ef9ca475d52ecf61e5a566
-DIST snmp-1.0.4.gem 202752 SHA256 44330f1f313fa933c92aa0cb277d572ed274bfff4f02dd1ff9afa11749ac23ef SHA512 1ceaf4019f5a5a8acf17ccde44f85c8b3ac66b6fcaa88bedc1298a3250ed80b1ac40859eb74bf6aad58e74f3a05bdbe13baa957f3e8f81f44664c7bd4526072e WHIRLPOOL 5e41cc4e9bb064547043ee596b6d14fc3c0c07ac45d7ec0d83912ca9987f4bffcd69c09c7168be4e5c0e185a350f41833083ed7b41c81f0bea8ad82e6243be5d
 DIST snmp-1.1.0.gem 203776 SHA256 f121fd6cb3382f49967d1406ddb2d54ce5215118564be5146f110d9b4ef53f85 SHA512 d2166b16e0097149501bfb409839304b319206bc21cbf63900a88ad25e7d9ac2c1de375f159707092928bfaa7fa16fbd4044c81da120588f99101c82bebf6781 WHIRLPOOL ad67713b8f07e51d79a6c27f104c06c60c74f1a4fc0bf8c87aaa389877fedc7918c02a510c714b73d1d1b1ea39556e38be0f8b2583b84b8531fdbf7a517ee50f
--- a/dev-ruby/snmplib/snmplib-1.0.4.ebuild
+++ b/dev-ruby/snmplib/snmplib-1.0.4.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.0.4.ebuild,v 1.2 2012/05/01 18:24:17 armin76 Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_NAME="snmp"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="SNMP library implemented in pure Ruby"
-HOMEPAGE="http://snmplib.rubyforge.org/"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="Ruby"
-SLOT="0"
-
-all_ruby_prepare() {
-	# Use the fully qualified class name to avoid problems with other
-	# Integer class definitions. Should fix
-	# https://bugs.gentoo.org/show_bug.cgi?id=323423
-	sed -i -e 's/\sInteger/ SNMP::Integer/' test/* || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
--- a/dev-ruby/spork/Manifest
+++ b/dev-ruby/spork/Manifest
@ -1,4 +1 @@
-DIST spork-0.8.4.gem 30720 SHA256 3881d4c6c42a8f1f18929ffa5086293f624c26bf7b2e416ac71216200b8d406f SHA512 096ebd48b624394dbea8878103c9e442176c198761edb7eac75dc3800f21e26346b02d84413796f584199094c7ec2e719fbd5f005172b5228a21b2ac5c5bea1b WHIRLPOOL 58fd8afb8523f4098ec9b4085a94a2e84ab20a279275b68445595b3f9758d105c4f8017fe74786b6124f3c0c5a2bcb5101ec68834f5c6ad18ff92961cf339476
-DIST spork-0.8.5.gem 30208 SHA256 266a4ef1972e0ef972a79f6f78cc7d5b2cf79411579205082ad7b3a1f74a2f8d SHA512 29f84287240731126d30322c2ae850f4d68a512f5f4703aae4f5ea3a124a39aca02e99477ddda5360d64f67ce71477a6763a729f2a7f3458d162c940670bfb6b WHIRLPOOL af85e565a3d1c8c6c780f7e065c1e276310708a231feaa58b0b20e59c7cb13a9a537e727f13f312ab0ffe21b85ae5385fe8bb5cbc7c17b41a2b03fda9cb44539
-DIST spork-0.9.0.gem 33280 SHA256 2511d8942742f6cb28fe9cb70649f1659e5217a7add1146a81752baa8349d347 SHA512 7869c2e54dc98e0c009a073e336c9ecd556b570fb8b59ea0a7695f95d28c04f0a3cfd680236ef51d2d34eb57d00c39005839214e0c1ca0b292ab7faa06b1aed8 WHIRLPOOL 7e53be2d1ba5cf6ca31682039aec25a106b21852dfe2ba6bad4931dd90a71efcc92d1e3ef153b6b0793c738d3ef50b397ca503e93feafe60ecdb788c702dc5ac
 DIST spork-0.9.2.gem 33280 SHA256 46d227b74a90c5a34d1275c836a8405b40755101a17ae07702d026109b77cb82 SHA512 04acbdb00cb23c74ab5e3737d85f6b353dd50555e01e13aa4e0289bc7716eaed144800127840d9eae8d580f020ab646351411f5c1cbf299cf17ed5a73d24d81a WHIRLPOOL e612d61ac25150a7cf6500bc8cc8dc2567c1fc20f17ac52a50f0140b2f50d6093753d2301d94c7ec711913caf1678831f1dfbc26b4679b6e4f1d4d4f0df3ad4f
--- a/dev-ruby/spork/spork-0.8.4-r1.ebuild
+++ b/dev-ruby/spork/spork-0.8.4-r1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.8.4-r1.ebuild,v 1.4 2012/06/12 11:45:00 iksaif Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="https://github.com/sporkrb/spork"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "dev-util/cucumber
-	>=dev-ruby/rspec-1.2.9:0
-	>=dev-ruby/rspec-rails-1.2.9
-	dev-util/cucumber-rails
-	>=dev-ruby/rails-2.3
-	>=dev-ruby/ruby-debug-0.10.3"
-
-each_ruby_prepare() {
-	# Don't use deprecated name in feature file.
-	sed -i -e 's/Fonction/Fonctionnalité/' features/cucumber_rails_integration.feature || die
-}
-
-each_ruby_test() {
-	${RUBY} -S spec spec || die
-	${RUBY} -Ilib -S cucumber features || die
-}
--- a/dev-ruby/spork/spork-0.8.5.ebuild
+++ b/dev-ruby/spork/spork-0.8.5.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.8.5.ebuild,v 1.2 2012/06/12 11:45:00 iksaif Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="https://github.com/sporkrb/spork"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "dev-util/cucumber
-	>=dev-ruby/rspec-1.2.9:0
-	>=dev-ruby/rspec-rails-1.2.9
-	dev-util/cucumber-rails
-	>=dev-ruby/rails-2.3
-	>=dev-ruby/ruby-debug-0.10.3"
-
-all_ruby_prepare() {
-	# Don't use deprecated name in feature file.
-	sed -i -e 's/Fonction/Fonctionnalité/' features/cucumber_rails_integration.feature || die
-
-	# Remove failing features when newer Rails versions are
-	# installed. This is fixed upstream, but only for the new beta
-	# versions and in a way that is too invasive to backport.
-	rm features/cucumber_rails_integration.feature \
-		features/rspec_rails_integration.feature   \
-		features/rails_delayed_loading_workarounds.feature || die
-}
-
-each_ruby_test() {
-	${RUBY} -S spec spec || die
-	${RUBY} -Ilib -S cucumber features || die
-}
--- a/Show More
+++ b/Show More