Sync with portage [Fri Nov 25 14:32:13 MSK 2011].

2011-11-25 14:32:13 +04:00 · 2011-11-25 14:32:13 +04:00 · c9aa5f6426
commit c9aa5f6426
parent 14083bc1cc
240 changed files with 4865 additions and 2991 deletions
--- a/app-cdr/cdrdao/cdrdao-1.2.3.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3.ebuild,v 1.9 2011/03/28 18:46:28 angelos Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-if [[ ${PV/*_rc*} ]]
-then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode pccts mad vorbis"
-
-RDEPEND="virtual/cdrtools
-	encode? ( >=media-sound/lame-3.90 )
-	gcdmaster? ( dev-libs/libsigc++:2
-		>=dev-cpp/gtkmm-2.4:2.4
-		>=dev-cpp/libgnomeuimm-2.6:2.6
-		media-libs/libao )
-	mad? ( media-libs/libmad
-		media-libs/libao )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libao )
-	!app-cdr/cue2toc"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pccts? ( >=dev-util/pccts-1.33.24-r1 )"
-
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.3-k3b.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_with gcdmaster xdao) \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
-}
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-k3b.patch
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-k3b.patch
@ -1,11 +0,0 @@
--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
-+++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
-@@ -207,7 +207,7 @@
- 
- static void printVersion()
- {
-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
-+  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
- 	  VERSION);
- 
-   std::list<std::string> list;
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@ -1 +1,2 @@
 DIST xfburn-0.4.3.tar.bz2 652080 RMD160 01dff258d42d05812cf0697304ebe0062291b185 SHA1 52d33e56b7ce9774fba680f50723eaf1a7215091 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe
+DIST xfburn_0.4.3-4.debian.tar.gz 25747 RMD160 e5eb2cc78aad447e194ef0f30521ec32c3b1fd3e SHA1 31aca5d1b08a1ff3ecd6315cbb86c765685140b7 SHA256 d5d2de1bccf7e5e4083beada69385a3e5a1d0636534b87fbd0af84cf1a8e53e5
--- a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
+++ b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ -0,0 +1,48 @@
+--- xfburn/xfburn-data-composition.c
+++ xfburn/xfburn-data-composition.c
+@@ -1852,26 +1852,29 @@
+           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
+       }
+ 
+-      basename = g_path_get_basename (src);
+      /* Check names only for items not manually created (#613563) */
+      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
+        basename = g_path_get_basename (src);
+
+        /* check if the file has been renamed */
+        if (strcmp (basename, name) != 0) {
+          /* rename the iso_node */
+          r = iso_node_set_name (node, name);
+
+          if (r == 0) {
+            /* The first string is the renamed name, the second one the original name */
+            xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+
+            g_free (basename);
+            g_free (name);
+            g_free (src);
+ 
+-      /* check if the file has been renamed */
+-      if (strcmp (basename, name) != 0) {
+-        /* rename the iso_node */
+-        r = iso_node_set_name (node, name);
+-
+-        if (r == 0) {
+-          /* The first string is the renamed name, the second one the original name */
+-	  xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+-
+-          g_free (basename);
+-          g_free (name);
+-          g_free (src);
+-
+-          continue;
+            continue;
+          }
+         }
+        g_free (basename);
+       }
+ 
+-      g_free (basename);
+       g_free (name);
+       g_free (src);
+ 
--- a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
+++ b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.1 2011/11/24 23:08:21 ssuominen Exp $
+
+EAPI=4
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-4.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gstreamer udev"
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=dev-libs/libburn-0.4.2
+	>=dev-libs/libisofs-0.6.2
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/exo-0.6
+	>=xfce-base/libxfce4ui-4.8
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
+	udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-update_desktop_entry.patch
+		"${FILESDIR}"/${P}-empty_directory_segmentation_fault-2.patch
+		)
+
+	XFCONF=(
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch EPATCH_SOURCE="${WORKDIR}"/debian/patches epatch
+	xfconf_src_prepare
+}
--- a/app-emacs/teco/Manifest
+++ b/app-emacs/teco/Manifest
@ -0,0 +1 @@
+DIST teco-7.el.bz2 16372 RMD160 73ca72286844171548303979b274843a550335bc SHA1 98707cf208484e01d082c2313dde4f880a2a7eb5 SHA256 28c04c00f36bc04ffd31291fa2718538a549a5d86dc372a427fba60b40801570
--- a/app-emacs/teco/files/50teco-gentoo.el
+++ b/app-emacs/teco/files/50teco-gentoo.el
@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'teco:command "teco" "Read and execute a Teco command string." t)
+(autoload 'teco "teco" "Read and execute a Teco command string." t)
+(autoload 'teco:copy-to-q-reg "teco" "Copy region into Teco q-reg REG." t)
--- a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
+++ b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
@ -0,0 +1,76 @@
+--- teco.el
+++ teco.el
+@@ -2213,9 +2213,11 @@
+ (define-key teco:command-keymap "/" 'teco:command-slash)
+ (define-key teco:command-keymap "*" 'teco:command-star)
+ 
+-(defvar teco:command-escapes nil
+-  "Records where ESCs are, since they are represented in the command buffer
+-by $.")
+(defvar teco:command-display-table
+  (let ((table (make-display-table)))
+    (aset table ?\e [?$])
+    table)
+  "Display table used while reading teco commands.")
+ 
+ (defun teco:copy-to-q-reg (char start end)
+   "Copy region into Teco q-reg REG.
+@@ -2244,15 +2246,11 @@
+ 
+ (defun teco:read-command ()
+   "Read a teco command string from the user."
+-  (let* ((teco:command-escapes nil)
+-	 (command (catch 'teco:command-quit
+-		    (read-from-minibuffer teco:prompt nil
+-					  teco:command-keymap))))
+-    (if command
+-	(while teco:command-escapes
+-	  (aset command (car teco:command-escapes) ?\e)
+-	  (setq teco:command-escapes (cdr teco:command-escapes))))
+-    command))
+    (minibuffer-with-setup-hook
+	(lambda ()
+	  (setq buffer-display-table teco:command-display-table))
+      (catch 'teco:command-quit
+	(read-from-minibuffer teco:prompt nil teco:command-keymap))))
+ 
+ (defun teco:command-self-insert ()
+   (interactive)
+@@ -2276,16 +2274,13 @@
+   (interactive)
+   ;; Two ESCs in a row terminate the command string
+   (if (eq last-command 'teco:command-escape)
+-      (throw 'teco:command-quit (buffer-string)))
+      (throw 'teco:command-quit (minibuffer-contents-no-properties)))
+   (teco:command-insert-character last-command-char))
+ 
+ (defun teco:command-ctrl-u ()
+   (interactive)
+   ;; delete the characters
+   (kill-line 0)
+-  ;; forget that they were ESCs
+-  (while (and teco:command-escapes (<= (point) (car teco:command-escapes)))
+-      (setq teco:command-escapes (cdr teco:command-escapes)))
+   ;; decide whether to shrink the window
+   (while (let ((a (insert ?\n))
+ 	       (b (pos-visible-in-window-p))
+@@ -2297,9 +2292,6 @@
+   (interactive)
+   ;; delete the character
+   (backward-delete-char 1)
+-  ;; forget that it was an ESC
+-  (if (and teco:command-escapes (= (1- (point)) (car teco:command-escapes)))
+-      (setq teco:command-escapes (cdr teco:command-escapes)))
+   ;; decide whether to shrink the window
+   (insert ?\n)
+   (if (prog1 (pos-visible-in-window-p)
+@@ -2362,9 +2354,6 @@
+ 
+ ;; Insert a single command character
+ (defun teco:command-insert-character (c)
+-  (if (eq c ?\e)
+-      (setq teco:command-escapes (cons (1- (point)) teco:command-escapes)
+-	    c ?$))
+   (insert c)
+   (if (not (pos-visible-in-window-p))
+       (enlarge-window 1)))
--- a/app-emacs/teco/metadata.xml
+++ b/app-emacs/teco/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+</pkgmetadata>
--- a/app-emacs/teco/teco-7.ebuild
+++ b/app-emacs/teco/teco-7.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/teco/teco-7.ebuild,v 1.2 2011/11/24 17:58:43 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="TECO interpreter for GNU Emacs"
+HOMEPAGE="http://www.emacswiki.org/emacs/TECO"
+# taken from: http://www.emacswiki.org/emacs/teco.el
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ELISP_PATCHES="${P}-minibuffer-prompt.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "To be able to invoke Teco directly, define a key binding"
+	elog "for teco:command in your ~/.emacs file, e.g.:"
+	elog "  (global-set-key \"\\C-z\" 'teco:command)"
+	elog "See ${SITELISP}/${PN}/teco.el for documentation."
+}
--- a/app-forensics/afflib/afflib-3.6.12.ebuild
+++ b/app-forensics/afflib/afflib-3.6.12.ebuild
@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.12.ebuild,v 1.2 2011/07/24 18:23:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.12.ebuild,v 1.3 2011/11/24 22:16:25 radhermit Exp $

 EAPI="4"
+PYTHON_DEPEND="python? 2"

-inherit eutils autotools
+inherit eutils autotools-utils python

 DESCRIPTION="Library that implements the AFF image standard"
 HOMEPAGE="http://www.afflib.org/"
@ -20,11 +21,17 @@ RDEPEND="dev-libs/expat
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse )
 	ncurses? ( sys-libs/ncurses )
-	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	s3? ( net-misc/curl )"
 DEPEND="${RDEPEND}"

+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-python-module.patch

@ -50,5 +57,5 @@ src_configure() {

 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	remove_libtool_files all
 }
--- a/app-forensics/libewf/libewf-20100226-r1.ebuild
+++ b/app-forensics/libewf/libewf-20100226-r1.ebuild
@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20100226-r1.ebuild,v 1.2 2011/09/28 01:13:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20100226-r1.ebuild,v 1.3 2011/11/24 22:31:42 radhermit Exp $

 EAPI="4"

+inherit autotools-utils
+
 DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
 HOMEPAGE="http://libewf.sourceforge.net"
 SRC_URI="mirror://sourceforge/libewf/${P}.tar.gz"
@ -35,5 +37,5 @@ src_install() {
 	emake install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog NEWS README documents/*.txt
 	doman manuals/*.1 manuals/*.3
-	find "${D}" -name '*.la' -exec rm -f {} +
+	remove_libtool_files all
 }
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@ -1,3 +1,4 @@
 DIST vifm-0.3a.tar.gz 493981 RMD160 bcdeccbf96b8030cf1f3d0a393311e7cffe96e77 SHA1 123254555eb337b1b7391bbbbe3b57475717a60f SHA256 6afbd3ec09b8abc2f0fa5d122b6bcfbbc83f658f670dfede937afe448b0a5771
 DIST vifm-0.4.tar.bz2 353731 RMD160 004db08a4c0a977ca10a6096fca0ccf9c9f8fbec SHA1 ad548b6df513483865c8623c1ce83e173271d4bc SHA256 354b47f8a53a3a1cd3b7f9d5f4aa823ee6adbcdf5c2862b71b7162b8cfd3573f
 DIST vifm-0.5.tar.bz2 272835 RMD160 a48acbd471968a054aac3f34b13ee24ecbc711b8 SHA1 0563def0c538c846176e6910ae76cb24b2b1ed89 SHA256 11bc1138050d6b2887d7f099e12bc57d27cc60a6f14252744654c35d22d38164
+DIST vifm-0.7.1.tar.bz2 468781 RMD160 4d69523df9302f5537581c4859ce7e9ef1791d3d SHA1 15d713b1910d732d9c6ecf1d234038fa3f594352 SHA256 7c0f2e8949851394a0fa91a9e8509a58306ce3aebd27fed163fbec10c2258583
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@ -5,6 +5,12 @@
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<use>
+		<flag name="compatibility">Compatibility with previous versions of vifm</flag>
+		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
+		<flag name="magic">Use libmagic to determine mimetypes</flag>
+		<flag name="vim-plugin">Install the vifm vim plugin</flag>
+	</use>
 	<longdescription>
 	Vifm is a ncurses based file manager with vi like keybindings. If you
 	use vi, vifm gives you complete keyboard control over your files without
--- a/app-misc/vifm/vifm-0.7.1.ebuild
+++ b/app-misc/vifm/vifm-0.7.1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.1.ebuild,v 1.1 2011/11/24 22:03:54 wired Exp $
+
+EAPI=4
+inherit base
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE="+compatibility +extended-keys +magic vim-plugin vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.7-r7
+	magic? ( sys-apps/file )
+"
+RDEPEND="
+	${DEPEND}
+	vim-plugin? ( >=app-editors/vim-7.3 )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS=( AUTHORS TODO README )
+
+src_configure() {
+	econf \
+		$(use_enable compatibility compatibility-mode) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic)
+}
+
+src_install() {
+	base_src_install
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+	if use vim-plugin; then
+		local t
+		for t in doc plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".*
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "To use vim to view the vifm help, copy /usr/share/${P}/vifm.txt"
+	elog "	to ~/.vim/doc/ and run ':helptags ~/.vim/doc' in vim,"
+	elog "then edit ~/.vifm/vifmrc${PV/a/} and set USE_VIM_HELP=1"
+	elog ""
+	elog "To use the vifm plugin in vim, copy /usr/share/${P}/vifm.vim to"
+	elog "	/usr/share/vim/vimXX/"
+}
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.68.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.68.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.68.ebuild,v 1.1 2011/11/20 19:20:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.68.ebuild,v 1.2 2011/11/25 07:40:33 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="yes"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/PhoneManager"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 # telepathy support is considered experimental

--- a/app-portage/esearch/esearch-0.7.2-r2.ebuild
+++ b/app-portage/esearch/esearch-0.7.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.2-r2.ebuild,v 1.2 2011/08/25 00:28:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.2-r2.ebuild,v 1.3 2011/11/24 20:36:42 zmedico Exp $

 EAPI=3
 PYTHON_DEPEND=2:2.4
@ -37,9 +37,9 @@ src_install() {
 	exeinto /usr/$(get_libdir)/esearch
 	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"

-	dosym /usr/$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"
+	dosym ../$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
+	dosym ../$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
+	dosym ../$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"

 	doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
 	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
@ -54,7 +54,7 @@ src_install() {
 		doins fr/{esearch,eupdatedb,esync}.1 || die "doins failed"
 	fi

-	python_convert_shebangs -r 2 "${D}"
+	python_convert_shebangs -r 2 "${ED}"
 }

 pkg_postinst() {
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@ -1 +1,2 @@
 DIST icedtea-web-1.1.3.tar.gz 810141 RMD160 7f3c7063e538d15730337e1991fe9f1038cf83fe SHA1 5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37 SHA256 012390dfa8bb9a4b17b30640dfc21011c848f5017d2a21d945e933f5d514edb3
+DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="4"
+
+inherit autotools eutils java-pkg-2 java-vm-2
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="build doc javascript +nsplugin test"
+
+RDEPEND="dev-java/icedtea:${SLOT}"
+# Need system junit 4.8+. Bug #389795
+DEPEND="${RDEPEND}
+	javascript? ( dev-java/rhino:1.6 )
+	nsplugin? (
+		|| ( net-misc/npapi-sdk
+			>=net-libs/xulrunner-1.9.1 ) )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
+JAVA_PKG_WANT_SOURCE="1.6"
+JAVA_PKG_WANT_TARGET="1.6"
+
+pkg_setup() {
+	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	else
+		# migration logic
+		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
+			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+		else
+			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
+		fi
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_prepare() {
+	# bug #356645
+	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
+	eautoreconf
+}
+
+src_configure() {
+	local vmhome=$(java-config -O)
+
+	if use build; then
+		icedteadir="${ICEDTEA_BIN_DIR}"
+		installdir="/opt/icedtea${SLOT}-web-bin"
+	else
+		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	fi
+
+	unset_vars
+
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
+		VMHANDLE="icedtea-${SLOT}"
+	else
+		die "Unexpected install location of IcedTea${SLOT}"
+	fi
+
+	einfo "Installing IcedTea-Web in ${installdir}"
+	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
+	if [ ! -e ${vmhome} ] ; then
+		eerror "Could not find JDK install directory ${vmhome}."
+		die
+	fi
+
+	# we need to override all *dir variables that econf sets
+	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
+	# the suffix the man page will end up compressed with, anyway
+	econf \
+		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
+		--with-jdk-home=${icedteadir} \
+		$(use_enable doc docs) \
+		$(use_enable nsplugin plugin) \
+		$(use_with javascript rhino)
+}
+
+src_compile() {
+	# we need this to override the src_compile from java-pkg-2
+	default
+}
+
+src_install() {
+	# parallel make problem bug #372235
+	emake -j1 DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	if use nsplugin; then
+		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
+	fi
+
+	for binary in javaws itweb-settings; do
+		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
+		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
+	done
+}
+
+pkg_postinst() {
+	java-vm_check-nsplugin
+	java_mozilla_clean_
+
+	if use nsplugin; then
+		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+	fi
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	:;
+}
--- a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="4"
+
+inherit autotools eutils java-pkg-2 java-vm-2
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="build doc javascript +nsplugin test"
+
+RDEPEND="dev-java/icedtea:${SLOT}"
+# Need system junit 4.8+. Bug #389795
+DEPEND="${RDEPEND}
+	javascript? ( dev-java/rhino:1.6 )
+	nsplugin? (
+		|| ( net-misc/npapi-sdk
+			>=net-libs/xulrunner-1.9.1 ) )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
+JAVA_PKG_WANT_SOURCE="1.6"
+JAVA_PKG_WANT_TARGET="1.6"
+
+pkg_setup() {
+	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	else
+		# migration logic
+		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
+			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+		else
+			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
+		fi
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_prepare() {
+	# bug #356645
+	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
+	eautoreconf
+}
+
+src_configure() {
+	local vmhome=$(java-config -O)
+
+	if use build; then
+		icedteadir="${ICEDTEA_BIN_DIR}"
+		installdir="/opt/icedtea${SLOT}-web-bin"
+	else
+		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	fi
+
+	unset_vars
+
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
+		VMHANDLE="icedtea-${SLOT}"
+	else
+		die "Unexpected install location of IcedTea${SLOT}"
+	fi
+
+	einfo "Installing IcedTea-Web in ${installdir}"
+	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
+	if [ ! -e ${vmhome} ] ; then
+		eerror "Could not find JDK install directory ${vmhome}."
+		die
+	fi
+
+	# we need to override all *dir variables that econf sets
+	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
+	# the suffix the man page will end up compressed with, anyway
+	econf \
+		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
+		--with-jdk-home=${icedteadir} \
+		$(use_enable doc docs) \
+		$(use_enable nsplugin plugin) \
+		$(use_with javascript rhino)
+}
+
+src_compile() {
+	# we need this to override the src_compile from java-pkg-2
+	default
+}
+
+src_install() {
+	# parallel make problem bug #372235
+	emake -j1 DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	if use nsplugin; then
+		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
+	fi
+
+	for binary in javaws itweb-settings; do
+		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
+		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
+	done
+}
+
+pkg_postinst() {
+	java-vm_check-nsplugin
+	java_mozilla_clean_
+
+	if use nsplugin; then
+		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+	fi
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	:;
+}
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@ -14,6 +14,7 @@
 </maintainer>
 <longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription>
 <use>
+  <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
  <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
 </use>
 </pkgmetadata>
--- a/dev-java/jusb/jusb-0.4.4-r1.ebuild
+++ b/dev-java/jusb/jusb-0.4.4-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jusb/jusb-0.4.4-r1.ebuild,v 1.3 2009/07/25 19:54:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jusb/jusb-0.4.4-r1.ebuild,v 1.4 2011/11/25 02:01:58 robbat2 Exp $

 inherit eutils java-pkg-2 linux-info flag-o-matic multilib

@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.4"

 S=${WORKDIR}

-CONFIG_CHECK="USB_DEVICEFS"
+CONFIG_CHECK="~USB_DEVICEFS"

 ERROR_CONFIG_USB_DEVICEFS="
 You need to turn on the USB device filesystem
--- a/dev-lang/orc/orc-0.4.14.ebuild
+++ b/dev-lang/orc/orc-0.4.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.14.ebuild,v 1.4 2011/10/11 19:54:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.14.ebuild,v 1.5 2011/11/24 22:42:57 naota Exp $

 EAPI=3
 inherit autotools flag-o-matic
@ -11,7 +11,7 @@ SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"

 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs examples"

 src_prepare() {
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,10 +1,14 @@
 DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2
 DIST php-5.3.9RC1.tar.bz2 11230477 RMD160 d00734de38b5cc2e719f5f80ac609e4362f6dfad SHA1 34306d0a7926a21ba15ee29ab37bbab44633b3fa SHA256 6d76af052c1575765d9bf03d8963415d437209fd790f74d85b523799f1dd718d
+DIST php-5.3.9RC2.tar.bz2 11415643 RMD160 2051cd223e30b49c93cd4282c4f4c51b45909547 SHA1 6699803c03f789cf9d311a9a0daab9d14515d5be SHA256 aac16a868056d2a19cb44b5b5732efb974a30dadc000d729c6374f3208005634
 DIST php-5.4.0RC1.tar.bz2 11321722 RMD160 4cae98d1d388bf18d70cd3041d0c314ac4788c69 SHA1 dc7fafeffb2039947bcbccf54fd811f66e46b558 SHA256 98f71de2d474c975326fd8452058f741843fe3b7db601f4788ed327adcc7a781
+DIST php-5.4.0RC2.tar.bz2 11797774 RMD160 5000f30470119ed2c3d9924c69aa8ce2b4f47f71 SHA1 96c2beaf3df65ad950e5206c709bb8e4e4e41c45 SHA256 1fd66dd2e34235d35d6521160e4dea44dd0bf01b0893e6f4a5b3b18706ff0845
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
 DIST php-patchset-5.3.8-r0.tar.bz2 7518 RMD160 3b9fc4063202b0a83b76a8c0f5bcfeb2ab358a50 SHA1 8b20057a68c9f6f4554ab96a884e874707fcd2e5 SHA256 a4677d75648529ccec61fc0edaa2684ad72c0b15bc81dc0770a6cbc927337686
 DIST php-patchset-5.3.9_rc1-r0.tar.bz2 7522 RMD160 4bf3d9bb26d86858ab26be0aa0466eaef4001553 SHA1 cd0dd6704b0c0b04cc1c78027efdfbcc5a9d182c SHA256 95863c23bd9a72013729dcdd005dc585ad5b3d689082503a3702f20df514362f
+DIST php-patchset-5.3.9_rc2-r0.tar.bz2 7515 RMD160 c3aca464d04df468fc8aaf6237be49bd891822b8 SHA1 228617dba2801397a5b51ca66fc9c90cf224a768 SHA256 afa2d477c630c2bdd2c3cd5eec24d7eb3e3a7cfd9819b4f4f328c1aad5335612
 DIST php-patchset-5.4.0_rc1-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
+DIST php-patchset-5.4.0_rc2-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26
--- a/dev-lang/php/php-5.3.9_rc2.ebuild
+++ b/dev-lang/php/php-5.3.9_rc2.ebuild
@ -0,0 +1,414 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc2.ebuild,v 1.1 2011/11/25 09:10:47 olemarkus Exp $
+
+EAPI=4
+
+PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
+
+SUHOSIN_VERSION="5.3.7-0.9.10"
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"suhosin")
+			echo "http://download.suhosin.org/${2}"
+		;;
+		"olemarkus")
+			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
+	# in some cases we use our own suhosin patch (very recent version,
+	# patch conflicts, etc.)
+	SUHOSIN_TYPE="gentoo"
+else
+	SUHOSIN_TYPE="suhosin"
+fi
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SRC_URI="${SRC_URI}
+		suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# Gentoo-specific, common features
+IUSE="kolab"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
+	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
+	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls oci8
+	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
+	readline recode sapdb +session sharedext sharedmem
+	+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
+
+DEPEND="!dev-lang/php:5
+	>=app-admin/eselect-php-0.6.2
+	>=dev-libs/libpcre-8.12[unicode]
+	adabas? ( >=dev-db/unixODBC-1.8.13 )
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	birdstep? ( >=dev-db/unixODBC-1.8.13 )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? ( !gd-external? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) ) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	db2? ( >=dev-db/unixODBC-1.8.13 )
+	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
+	empress? ( >=dev-db/unixODBC-1.8.13 )
+	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
+	enchant? ( app-text/enchant )
+	esoob? ( >=dev-db/unixODBC-1.8.13 )
+	exif? ( !gd? ( !gd-external? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) ) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gd-external? ( media-libs/gd )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	kolab? ( >=net-libs/c-client-2004g-r1 )
+	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
+	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sapdb? ( >=dev-db/unixODBC-1.8.13 )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	solid? ( >=dev-db/unixODBC-1.8.13 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) )
+	sqlite3? ( >=dev-db/sqlite-3.7.7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? ( !gd-external? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( || ( gd gd-external ) )
+	cjk? ( || ( gd gd-external ) )
+	exif? ( || ( gd gd-external ) )
+
+	xpm? ( gd )
+	gd? ( zlib !gd-external )
+	gd-external? ( !gd )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap !oci8 )
+	adabas? ( odbc )
+	birdstep? ( odbc )
+	dbmaker? ( odbc )
+	empress-bcs? ( empress )
+	empress? ( odbc )
+	esoob? ( odbc )
+	db2? ( odbc )
+	sapdb? ( odbc )
+	solid? ( odbc )
+	kolab? ( imap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	oci8? ( !oci8-instant-client !ldap-sasl )
+	oci8-instant-client? ( !oci8 )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	firebird? ( !interbase )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+DEPEND="${DEPEND}
+	enchant? ( !dev-php5/pecl-enchant )
+	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php5/pecl-filter )
+	json? ( !dev-php5/pecl-json )
+	phar? ( !dev-php5/pecl-phar )
+	zip? ( !dev-php5/pecl-zip )"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+RDEPEND="${DEPEND}"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+# eblit-core
+# Usage: <function> [version] [eval]
+# Main eblit engine
+eblit-core() {
+	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
+	local e v func=$1 ver=$2 eval_=$3
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# eblit-include
+# Usage: [--skip] <function> [version]
+# Includes an "eblit" -- a chunk of common code among ebuilds in a given
+# package so that its functions can be sourced and utilized within the
+# ebuild.
+eblit-include() {
+	local skipable=false r=0
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
+	eblit-core $1 $2
+	r="$?"
+	${skipable} && return 0
+	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# Usage: <function>
+# Runs a function if it is defined in an eblit
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run
+# Usage: <function> [version]
+# Runs a function defined in an eblit
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# eblit-pkg
+# Usage: <phase> [version]
+# Includes the given functions AND evals them so they're included in the binpkgs
+eblit-pkg() {
+	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
+	eblit-core $1 $2 1
+}
+
+eblit-pkg pkg_setup v2
+
+src_prepare() { eblit-run src_prepare v3 ; }
+src_configure() { eblit-run src_configure v2 ; }
+src_compile() { eblit-run src_compile v1 ; }
+src_install() { eblit-run src_install v2 ; }
+src_test() { eblit-run src_test v1 ; }
+
+#Do not use eblit for this because it will not get sourced when installing from
+#binary package (bug #380845)
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in /etc/make.conf"
+	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+	# check for not yet migrated old style config dirs
+	ls "${ROOT}"/etc/php/*-php5 &>/dev/null
+	if [[ $? -eq 0 ]]; then
+		ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
+		ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
+	fi
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+
+	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
+		ewarn "The suhosin USE flag now only installs the suhosin patch!"
+		ewarn "If you want the suhosin extension, make sure you install"
+		ewarn " dev-php5/suhosin"
+		ewarn
+	fi
+}
--- a/dev-lang/php/php-5.4.0_rc2.ebuild
+++ b/dev-lang/php/php-5.4.0_rc2.ebuild
@ -0,0 +1,332 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc2.ebuild,v 1.1 2011/11/25 09:10:47 olemarkus Exp $
+
+EAPI=4
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+SUHOSIN_VERSION=""
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-stas")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"suhosin")
+			echo "http://download.suhosin.org/${2}"
+		;;
+		"olemarkus")
+			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php-stas"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
+	# in some cases we use our own suhosin patch (very recent version,
+	# patch conflicts, etc.)
+	SUHOSIN_TYPE="gentoo"
+else
+	SUHOSIN_TYPE="suhosin"
+fi
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SRC_URI="${SRC_URI}
+		suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# Gentoo-specific, common features
+IUSE="kolab"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug doc
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
+	readline recode +session sharedmem
+	+simplexml snmp soap sockets spell sqlite3 ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
+
+DEPEND="!dev-lang/php:5
+	>=app-admin/eselect-php-0.6.2
+	>=dev-libs/libpcre-8.12[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	kolab? ( >=net-libs/c-client-2004g-r1 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap )
+	kolab? ( imap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+DEPEND="${DEPEND}
+	enchant? ( !dev-php5/pecl-enchant )
+	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php5/pecl-filter )
+	json? ( !dev-php5/pecl-json )
+	phar? ( !dev-php5/pecl-phar )
+	zip? ( !dev-php5/pecl-zip )"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+# eblit-core
+# Usage: <function> [version] [eval]
+# Main eblit engine
+eblit-core() {
+	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
+	local e v func=$1 ver=$2 eval_=$3
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# eblit-include
+# Usage: [--skip] <function> [version]
+# Includes an "eblit" -- a chunk of common code among ebuilds in a given
+# package so that its functions can be sourced and utilized within the
+# ebuild.
+eblit-include() {
+	local skipable=false r=0
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
+	eblit-core $1 $2
+	r="$?"
+	${skipable} && return 0
+	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# Usage: <function>
+# Runs a function if it is defined in an eblit
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run
+# Usage: <function> [version]
+# Runs a function defined in an eblit
+eblit-run() {
+	eblit-include --skip common v2
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# eblit-pkg
+# Usage: <phase> [version]
+# Includes the given functions AND evals them so they're included in the binpkgs
+eblit-pkg() {
+	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
+	eblit-core $1 $2 1
+}
+
+eblit-pkg pkg_setup v3
+
+src_prepare() { eblit-run src_prepare v4 ; }
+src_configure() { eblit-run src_configure v3 ; }
+src_compile() { eblit-run src_compile v2 ; }
+src_install() { eblit-run src_install v3 ; }
+src_test() { eblit-run src_test v1 ; }
+pkg_postinst() { eblit-run pkg_postinst v2 ; }
--- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
@ -4,12 +4,21 @@ http://bugs.gentoo.org/show_bug.cgi?id=331129

 --- js/src/Makefile.ref
 +++ js/src/Makefile.ref
+@@ -87,7 +87,7 @@
+ LDFLAGS                = $(XLDFLAGS)
+ 
+ ifndef NO_LIBM
+-LDFLAGS += -lm
+OTHER_LIBS += -lm
+ endif
+ 
+ # Prevent floating point errors caused by VC++ optimizations
@@ -325,7 +325,7 @@
 	$(CC) -o $@ -c $(CFLAGS) $<
 
 $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
 -	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
-+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $^
+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^
 
 endif
 
@ -18,7 +27,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=331129
 else
 $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
 -	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
+	$(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \
 	    $(PROG_LIBS)
 endif
 
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@ -1 +1 @@
-DIST redland-bindings-1.0.13.1.tar.gz 776744 RMD160 e07edd593c6e16d399b384268f99231b3c89026a SHA1 a3dee2bcd5961917a951544654e147b49bf17434 SHA256 1c5ae133b32e22db729c7faf8fdac5ef1aa195987ebd6a6ee27d4d96fd1a74a7
+DIST redland-bindings-1.0.14.1.tar.gz 792557 RMD160 d2d67c9f0c66e0a220c3fdd48a9f441f47890abb SHA1 b7e137498c190ba49409a7b91fbd3962b7ebcbef SHA256 a8cc365fccf292c56d53341ecae57fe8727e5002e048ca25f6251b5e595aec40
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.13.1.ebuild,v 1.1 2011/07/29 11:14:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland-bindings/redland-bindings-1.0.14.1.ebuild,v 1.1 2011/11/25 00:08:43 ssuominen Exp $

-EAPI=3
+EAPI=4
 PYTHON_DEPEND="python? 2:2.7"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
@ -18,14 +18,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"

-RDEPEND=">=dev-libs/redland-1.0.10-r2
+RDEPEND=">=dev-libs/redland-1.0.14
 	lua? ( >=dev-lang/lua-5.1 )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
 	ruby? ( dev-lang/ruby dev-ruby/log4r )"
 DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.26
 	dev-util/pkgconfig
+	>=dev-lang/swig-2
 	sys-apps/sed"

 pkg_setup() {
@ -34,7 +34,6 @@ pkg_setup() {

 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_with lua) \
 		$(use_with perl) \
 		$(use_with python) \
@ -74,7 +73,7 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install || die
+	emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install

 	if use perl; then
 		find "${ED}" -type f -name perllocal.pod -delete
--- a/dev-libs/seed/Manifest
+++ b/dev-libs/seed/Manifest
@ -1,3 +1,2 @@
 DIST seed-2.30.0.tar.bz2 770032 RMD160 b61883b7aaec557cac5efcc7ef9fd7874a9bb607 SHA1 7f3fe1fcea29c43d65c9ab6a90c56ecdcdd807c2 SHA256 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361
-DIST seed-3.0.0.tar.bz2 772779 RMD160 ccd621bdcb4f55fadb23e5c13cacc82a58d75878 SHA1 03e77d8f816aafa1aca7c507ec6bea3b89653c08 SHA256 c7ef8e0c7cfe633c6bf9bfc13ab56458f053dfb12b784c75cc50dfa7cf828be6
 DIST seed-3.2.0.tar.xz 682096 RMD160 b7e534571ef383d229179892d6057cb53028766e SHA1 9758d315f0bff292a7cbabcb36c5fe9ba11c7561 SHA256 3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0
--- a/dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch
+++ b/dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch
@ -1,585 +0,0 @@
-From 4f52b1ef263df971f677f4ad88f9766c26a15a89 Mon Sep 17 00:00:00 2001
-From: Jonathan Callen <abcd@gentoo.org>
-Date: Fri, 16 Jul 2010 04:41:52 -0400
-Subject: [PATCH] Cleanup autotools
-
---
- Makefile.am                         |    2 --
- configure.ac                        |   30 +++++++++++++++---------------
- extensions/Makefile.am              |    7 ++++---
- libseed/Makefile.am                 |    6 ++++--
- modules/cairo/Makefile.am           |   27 ++++++++++++++-------------
- modules/canvas/Makefile.am          |    8 +++++---
- modules/dbus/Makefile.am            |   24 +++++++++++-------------
- modules/example/Makefile.am         |    6 ++++--
- modules/ffi/Makefile.am             |    8 +++++---
- modules/gettext/Makefile.am         |    6 ++++--
- modules/gtkbuilder/Makefile.am      |    8 +++++---
- modules/libxml/Makefile.am          |   12 ++++++------
- modules/mpfr/Makefile.am            |   11 +++++------
- modules/multiprocessing/Makefile.am |    6 ++++--
- modules/os/Makefile.am              |    7 ++++---
- modules/readline/Makefile.am        |    8 +++++---
- modules/sandbox/Makefile.am         |    6 ++++--
- modules/sqlite/Makefile.am          |    9 +++++----
- src/Makefile.am                     |    8 ++++----
- tests/c/Makefile.am                 |    6 ++----
- 20 files changed, 110 insertions(+), 95 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 5bfb716..2183798 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
-ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = po \
- 	libseed \
- 	src \
-diff --git a/configure.ac b/configure.ac
-index 3bbcccd..fa751a2 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -54,9 +54,9 @@ if test x"$have_ffi_pkgconfig" = xno ; then
- 
- 		AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
- 		if test x"$ac_cv_search_ffi_call" = x"none required" ; then
-			FFI_LDFLAGS=$other_LIBS
-+			FFI_LIBS=$other_LIBS
- 		else
-			FFI_LDFLAGS="$ac_cv_search_ffi_call $other_LIBS"
-+			FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
- 		fi
- 		LIBS=$save_LIBS
- 	fi
-@@ -69,18 +69,18 @@ if test x"$have_ffi_pkgconfig" = xno ; then
- 	AC_MSG_RESULT([$have_ffi_h])
- fi
- 
-AC_SUBST(FFI_LDFLAGS)
-+AC_SUBST(FFI_LIBS)
- AC_SUBST(FFI_CFLAGS)
- 
- dnl ==============================WebKit=======================================
- PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)
- AC_SUBST(WEBKIT_CFLAGS)
-AC_SUBST(WEBKIT_LDFLAGS)
-+AC_SUBST(WEBKIT_LIBS)
- 
- dnl =========================Introspection=====================================
- PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= 0.6.14)
- AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
-AC_SUBST(GOBJECT_INTROSPECTION_LDFLAGS)
-+AC_SUBST(GOBJECT_INTROSPECTION_LIBS)
- 
- dnl ========================GNOME-js common====================================
- PKG_CHECK_MODULES(GNOME_JS, gnome-js-common)
-@@ -97,10 +97,10 @@ AC_ARG_ENABLE(canvas-module,
- if test x"$want_canvas_module" == x"yes" ; then
- 	PKG_CHECK_MODULES(CAIRO, cairo)
- 	AC_SUBST(CAIRO_CFLAGS)
-	AC_SUBST(CAIRO_LDFLAGS)
-+	AC_SUBST(CAIRO_LIBS)
- 	PKG_CHECK_MODULES(GDK, gdk-2.0)
- 	AC_SUBST(GDK_CFLAGS)
-	AC_SUBST(GDK_LDFLAGS)
-+	AC_SUBST(GDK_LIBS)
- fi
- 
- AM_CONDITIONAL(BUILD_CANVAS_MODULE, test "x$want_canvas_module" = "xyes")
-@@ -137,7 +137,7 @@ AC_ARG_ENABLE(sqlite-module,
- if test x"$want_sqlite_module" == x"yes" ; then
- 	PKG_CHECK_MODULES(SQLITE, sqlite3)
- 	AC_SUBST(SQLITE_CFLAGS)
-	AC_SUBST(SQLITE_LDFLAGS)
-+	AC_SUBST(SQLITE_LIBS)
- fi
- 
- AM_CONDITIONAL(BUILD_SQLITE_MODULE, test "x$want_sqlite_module" = "xyes")
-@@ -165,10 +165,10 @@ AC_SUBST(BUILD_DBUS_MODULE)
- if test x"$want_dbus_module" == x"yes" ; then
- 	PKG_CHECK_MODULES(DBUS, dbus-1)
- 	AC_SUBST(DBUS_CFLAGS)
-	AC_SUBST(DBUS_LDFLAGS)
-+	AC_SUBST(DBUS_LIBS)
- 	PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1)
- 	AC_SUBST(DBUSGLIB_CFLAGS)
-	AC_SUBST(DBUSGLIB_LDFLAGS)
-+	AC_SUBST(DBUSGLIB_LIBS)
- fi
- 
- 
-@@ -202,7 +202,7 @@ AC_ARG_ENABLE(libxml-module,
- if test x"$want_libxml_module" == x"yes" ; then
-    PKG_CHECK_MODULES(LIBXML, libxml-2.0)
-    AC_SUBST(LIBXML_CFLAGS)
-   AC_SUBST(LIBXML_LDFLAGS)
-+   AC_SUBST(LIBXML_LIBS)
- fi
- 
- AM_CONDITIONAL(BUILD_LIBXML_MODULE, test "x$want_libxml_module" = "xyes")
-@@ -227,7 +227,7 @@ AC_ARG_ENABLE(gtkbuilder-module,
- if test x"$want_gtkbuilder_module" == x"yes" ; then
-    PKG_CHECK_MODULES(GTK, gtk+-2.0)
-    AC_SUBST(GTK_CFLAGS)
-   AC_SUBST(GTK_LDFLAGS)
-+   AC_SUBST(GTK_LIBS)
- fi
- 
- AM_CONDITIONAL(BUILD_GTKBUILDER_MODULE, test "x$want_gtkbuilder_module" = "xyes")
-@@ -243,7 +243,7 @@ AC_ARG_ENABLE(cairo-module,
- if test x"$want_cairo_module" == x"yes" ; then
- 	PKG_CHECK_MODULES(CAIRO, cairo)
- 	AC_SUBST(CAIRO_CFLAGS)
-	AC_SUBST(CAIRO_LDFLAGS)
-+	AC_SUBST(CAIRO_LIBS)
- fi
- 
- AM_CONDITIONAL(BUILD_CAIRO_MODULE, test "x$want_cairo_module" = "xyes")
-@@ -277,9 +277,9 @@ if test x"$want_mpfr_module" == x"yes" ; then
- 
- 		AC_SEARCH_LIBS(mpfr_init2,mpfr,,AC_MSG_ERROR([mpfr not found]),$other_LIBS)
- 		if test x"$ac_cv_search_mpfr_call" = x"none required" ; then
-			MPFR_LDFLAGS=$other_LIBS
-+			MPFR_LIBS=$other_LIBS
- 		else
-			MPFR_LDFLAGS="$other_LIBS"
-+			MPFR_LIBS="$other_LIBS"
- 		fi
- 		LIBS=$save_LIBS
- 	fi
-diff --git a/extensions/Makefile.am b/extensions/Makefile.am
-index 6f30f2e..fd5dff0 100644
--- a/extensions/Makefile.am
-+++ b/extensions/Makefile.am
-@@ -1,10 +1,11 @@
-EXTRA_DIST= Gio.js Seed.js.in Gtk.js GObject.js Clutter.js Gst.js repl.js
-+EXTRA_DIST= Seed.js.in
- 
- extensiondir=$(datadir)/seed/extensions
-extension_DATA = Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js
-+extension_DATA = Seed.js
-+dist_extension_DATA = Gio.js Gtk.js GObject.js Clutter.js Gst.js
- 
- repldir=$(datadir)/seed
-repl_DATA = repl.js
-+dist_repl_DATA = repl.js
- 
- Seed.js: Seed.js.in
- 	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
-diff --git a/libseed/Makefile.am b/libseed/Makefile.am
-index 909aa2a..04e263d 100644
--- a/libseed/Makefile.am
-+++ b/libseed/Makefile.am
-@@ -35,12 +35,14 @@ libseed_la_CFLAGS = \
- 	$(FFI_CFLAGS)
- 
- libseed_la_LDFLAGS = \
-	-no-undefined \
-+	-no-undefined
-+
-+libseed_la_LIBADD = \
- 	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(WEBKIT_LIBS) \
- 	$(SEED_PROFILE_LIBS) \
- 	$(SEED_OSX_LIBS) \
-	$(FFI_LDFLAGS)
-+	$(FFI_LIBS)
- 
- seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
- 
-diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am
-index 139601a..3ea87d5 100644
--- a/modules/cairo/Makefile.am
-+++ b/modules/cairo/Makefile.am
-@@ -1,13 +1,5 @@
- if BUILD_CAIRO_MODULE
- 
-EXTRA_DIST = seed-cairo-enums.h \
-             seed-cairo.h \
-             seed-cairo-image-surface.h \
-             seed-cairo-matrix.h \
-             seed-cairo-pattern.h \
-             seed-cairo-pdf-surface.h \
-             seed-cairo-surface.h
-
- seedlibdir = ${libdir}/seed
- 
- seedlib_LTLIBRARIES = \
-@@ -15,12 +7,19 @@ seedlib_LTLIBRARIES = \
- 
- libseed_cairo_la_SOURCES = \
- 	seed-cairo.c \
-+	seed-cairo.h \
- 	seed-cairo-surface.c \
-+	seed-cairo-surface.h \
- 	seed-cairo-image-surface.c \
-+	seed-cairo-image-surface.h \
- 	seed-cairo-pdf-surface.c \
-+	seed-cairo-pdf-surface.h \
- 	seed-cairo-matrix.c \
-+	seed-cairo-matrix.h \
- 	seed-cairo-pattern.c \
-	seed-cairo-enums.c 
-+	seed-cairo-pattern.h
-+	seed-cairo-enums.c \
-+	seed-cairo-enums.h
- 
- libseed_cairo_la_CFLAGS = \
- 	-Wall \
-@@ -32,10 +31,12 @@ libseed_cairo_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_cairo_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(GDK_LDFLAGS) \
-	$(CAIRO_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_cairo_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(GDK_LIBS) \
-+	$(CAIRO_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/canvas/Makefile.am b/modules/canvas/Makefile.am
-index 11a3929..4b28259 100644
--- a/modules/canvas/Makefile.am
-+++ b/modules/canvas/Makefile.am
-@@ -17,9 +17,11 @@ libseed_canvas_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_canvas_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(CAIRO_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_canvas_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(CAIRO_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
-index 9f7fdb3..625e99b 100644
--- a/modules/dbus/Makefile.am
-+++ b/modules/dbus/Makefile.am
-@@ -2,14 +2,10 @@ if BUILD_DBUS_MODULE
- 
- SUBDIRS = util
- 
-EXTRA_DIST = dbus2js.py \
-			 dbus.js \
-			 dbus-values.h \
-			 lang.js \
-			 dbus-exports.h
-+EXTRA_DIST = dbus2js.py
- 
- moduledir = $(datadir)/seed
-module_DATA = dbus.js lang.js
-+dist_module_DATA = dbus.js lang.js
- 
- seedlibdir = ${libdir}/seed
- 
-@@ -22,7 +18,9 @@ libseed_dbusnative_la_SOURCES = \
- 	util/dbus-proxy.c \
- 	util/dbus-signals.c \
- 	dbus-values.c  \
-	dbus-exports.c 
-+	dbus-values.h  \
-+	dbus-exports.c \
-+	dbus-exports.h
- 
- 
- libseed_dbusnative_la_CFLAGS = \
-@@ -35,12 +33,12 @@ libseed_dbusnative_la_CFLAGS = \
- 
- 
- libseed_dbusnative_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	-L/lib \
-	-ldbus-1 \
-	$(DBUS_LDFLAGS) \
-	-ldbus-glib-1 \
-+	-shared -module -avoid-version
-+
-+libseed_dbusnative_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(DBUS_LIBS) \
-+	$(DBUS_GLIB_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- 
-diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
-index d58f8ec..2524e32 100644
--- a/modules/example/Makefile.am
-+++ b/modules/example/Makefile.am
-@@ -15,8 +15,10 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_example_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_example_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/ffi/Makefile.am b/modules/ffi/Makefile.am
-index d7e879d..270fb12 100644
--- a/modules/ffi/Makefile.am
-+++ b/modules/ffi/Makefile.am
-@@ -23,10 +23,12 @@ libseed_ffi_la_CFLAGS = \
- 	$(FFI_CFLAGS)
- 
- libseed_ffi_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_ffi_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS) \
-	$(FFI_LDFLAGS)
-+	$(FFI_LIBS)
- 
- endif
- 
-diff --git a/modules/gettext/Makefile.am b/modules/gettext/Makefile.am
-index a182f4f..4c246d8 100644
--- a/modules/gettext/Makefile.am
-+++ b/modules/gettext/Makefile.am
-@@ -15,8 +15,10 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_gettext_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_gettext_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/gtkbuilder/Makefile.am b/modules/gtkbuilder/Makefile.am
-index 972efdc..3998be4 100644
--- a/modules/gtkbuilder/Makefile.am
-+++ b/modules/gtkbuilder/Makefile.am
-@@ -17,9 +17,11 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_gtkbuilder_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GTK_LDFLAGS) \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_gtkbuilder_la_LIBADD = \
-+	$(GTK_LIBS) \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/libxml/Makefile.am b/modules/libxml/Makefile.am
-index a1dba7b..cb0e96d 100644
--- a/modules/libxml/Makefile.am
-+++ b/modules/libxml/Makefile.am
-@@ -1,7 +1,5 @@
- if BUILD_LIBXML_MODULE
- 
-EXTRA_DIST = xml.js
-
- seedlibdir = ${libdir}/seed
- 
- seedlib_LTLIBRARIES = \
-@@ -18,13 +16,15 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_libxml_la_LDFLAGS = \
-	-module -avoid-version \
-	$(LIBXML_LDFLAGS) \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_libxml_la_LIBADD = \
-+	$(LIBXML_LIBS) \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- extensionsdir=$(datadir)/seed/extensions
-extensions_DATA=xml.js
-+dist_extensions_DATA=xml.js
- 
- endif
- 
-diff --git a/modules/mpfr/Makefile.am b/modules/mpfr/Makefile.am
-index d0497ec..06a6c00 100644
--- a/modules/mpfr/Makefile.am
-+++ b/modules/mpfr/Makefile.am
-@@ -7,6 +7,7 @@ seedlib_LTLIBRARIES = \
- 
- libseed_mpfr_la_SOURCES = \
- 	seed-mpfr.c \
-+	seed-mpfr.h \
- 	seed-mpfr-trig.c \
- 	seed-mpfr-arithmetic.c \
- 	seed-mpfr-cmp.c
-@@ -18,13 +19,11 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_mpfr_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(SEED_PROFILE_LIBS)
-
-libseed_mpfr_la_LIBADD = -lmpfr -lgmp
-+	-shared -module -avoid-version
- 
-EXTRA_DIST = seed-mpfr.h
-+libseed_mpfr_la_LIBADD = -lmpfr -lgmp \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(SEED_PROFILE_LIBS)
- 
- endif
- 
-diff --git a/modules/multiprocessing/Makefile.am b/modules/multiprocessing/Makefile.am
-index 1e39007..cb151f9 100644
--- a/modules/multiprocessing/Makefile.am
-+++ b/modules/multiprocessing/Makefile.am
-@@ -17,8 +17,10 @@ libseed_multiprocessing_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_multiprocessing_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_multiprocessing_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/os/Makefile.am b/modules/os/Makefile.am
-index 0781937..b4bdaf4 100644
--- a/modules/os/Makefile.am
-+++ b/modules/os/Makefile.am
-@@ -15,10 +15,11 @@ libseed_os_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_os_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_os_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	-lutil \
-	$(SEED_DEBUG_LDFLAGS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/modules/readline/Makefile.am b/modules/readline/Makefile.am
-index 8eff4e8..94965ca 100644
--- a/modules/readline/Makefile.am
-+++ b/modules/readline/Makefile.am
-@@ -16,10 +16,12 @@ libseed_readline_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_readline_la_LDFLAGS = \
-	-module -avoid-version \
-+	-shared -module -avoid-version
-+
-+libseed_readline_la_LIBADD = \
- 	-lreadline \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(FFI_LDFLAGS) \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(FFI_LIBS) \
- 	$(SEED_PROFILE_LIBS) 
- 
- endif
-diff --git a/modules/sandbox/Makefile.am b/modules/sandbox/Makefile.am
-index 8a53221..f79149c 100644
--- a/modules/sandbox/Makefile.am
-+++ b/modules/sandbox/Makefile.am
-@@ -14,8 +14,10 @@ AM_CPPFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_sandbox_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_sandbox_la_LIBADD = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- 
-diff --git a/modules/sqlite/Makefile.am b/modules/sqlite/Makefile.am
-index deedaba..15fedf4 100644
--- a/modules/sqlite/Makefile.am
-+++ b/modules/sqlite/Makefile.am
-@@ -17,10 +17,11 @@ libseed_sqlite_la_CFLAGS = \
- 	$(SEED_PROFILE_CFLAGS)
- 
- libseed_sqlite_la_LDFLAGS = \
-	-module -avoid-version \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(SQLITE_LDFLAGS) \
-	$(SEED_DEBUG_LDFLAGS) \
-+	-shared -module -avoid-version
-+
-+libseed_sqlite_la_LIBS = \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(SQLITE_LIBS) \
- 	$(SEED_PROFILE_LIBS)
- 
- endif
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04ee4c8..82c2efc 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,11 +16,11 @@ seed_CFLAGS = \
- 	$(GOBJECT_INTROSPECTION_CFLAGS) \
- 	$(WEBKIT_CFLAGS)
- 
-seed_LDFLAGS = \
-+seed_LDADD = \
- 	$(SEED_PROFILE_LIBS) \
-	$(LIBFFI_LDFLAGS) \
-	$(GOBJECT_INTROSPECTION_LDFLAGS) \
-	$(WEBKIT_LDFLAGS)
-+	$(LIBFFI_LIBS) \
-+	$(GOBJECT_INTROSPECTION_LIBS) \
-+	$(WEBKIT_LIBS)
- 
- seed_LDADD = \
- 	../libseed/libseed.la
-diff --git a/tests/c/Makefile.am b/tests/c/Makefile.am
-index cb72d00..48b1bc2 100644
--- a/tests/c/Makefile.am
-+++ b/tests/c/Makefile.am
-@@ -16,9 +16,7 @@ test_CFLAGS = \
- 	-Wall \
- 	$(GOBJECT_INTROSPECTION_CFLAGS)
- 
-test_LDFLAGS = \
-	$(GOBJECT_INTROSPECTION_LIBS)
-
- test_LDADD = \
-	../../libseed/libseed.la
-+	../../libseed/libseed.la \
-+	$(GOBJECT_INTROSPECTION_LIBS)
- 
-- 
-1.7.1.1
-
--- a/dev-libs/seed/seed-3.0.0.ebuild
+++ b/dev-libs/seed/seed-3.0.0.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/seed-3.0.0.ebuild,v 1.1 2011/08/14 15:19:36 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOMAKE="1.11"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Javascript bindings for Webkit-GTK and GNOME libraries"
-HOMEPAGE="http://live.gnome.org/Seed"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc profile test"
-
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.9
-
-	dev-libs/glib:2
-	virtual/libffi
-	x11-libs/cairo
-	x11-libs/gtk+:3[introspection]
-	net-libs/webkit-gtk:3
-	gnome-base/gnome-js-common
-	dev-db/sqlite:3
-	dev-libs/dbus-glib
-	dev-libs/mpfr
-	dev-libs/libxml2:2
-	sys-apps/dbus
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-0.9 )
-	profile? ( sys-devel/gcc )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-webkit=3.0
-		--enable-readline-module
-		--enable-os-module
-		--enable-ffi-module
-		--enable-gtkbuilder-module
-		--enable-cairo-module
-		--enable-gettext-module
-		--enable-dbus-module
-		--enable-mpfr-module
-		--enable-sqlite-module
-		--enable-libxml-module"
-
-	# configure behaves very strangely and enables profiling if we pass either
-	# --disable-profile or --enable-profile
-	if use profile; then
-		G2CONF="${G2CONF}
-			--enable-profile
-			--enable-profile-modules"
-		if ! use debug; then
-			elog "USE=profile needs debug, auto-enabling..."
-			G2CONF="${G2CONF} --enable-debug"
-		fi
-	fi
-
-	if use profile && has ccache ${FEATURES}; then
-		ewarn "USE=profile behaves very badly with ccache; it tries to create"
-		ewarn "profiling data in CCACHE_DIR. Please disable one of them!"
-	fi
-}
-
-#src_prepare() {
-	# I've no idea what abcd did here; the patch doesn't apply anymore (nirbheek)
-#	epatch "${FILESDIR}/${PN}-2.31.5-cleanup-autotools.patch"
-#
-#	intltoolize --automake --copy --force || die "intltoolize failed"
-#	eautoreconf
-#}
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@ -1,2 +1,3 @@
 DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
+DIST matplotlib-1.1.0.tar.gz 35842643 RMD160 9313fc6407271c46f3ac5af4c53df5ea57982711 SHA1 435b4f04a7e099b79f66451d69ad0b5ce66030ae SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7
 DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
--- a/dev-python/matplotlib/matplotlib-1.1.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.1 2011/11/25 05:47:17 bicatali Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+WX_GTK_VER="2.8"
+
+inherit distutils eutils
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )
+	examples? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )"
+
+IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="PYTHON BSD"
+
+CDEPEND="dev-python/numpy
+	dev-python/python-dateutil
+	dev-python/pytz
+	media-libs/freetype:2
+	media-libs/libpng
+	gtk? ( dev-python/pygtk )
+	wxwidgets? ( dev-python/wxpython:2.8 )"
+
+DEPEND="${CDEPEND}
+	dev-python/pycxx
+	dev-util/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/imaging
+		dev-python/ipython
+		dev-python/xlwt
+		dev-python/sphinx
+		media-gfx/graphviz[cairo]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+	)"
+
+RDEPEND="${CDEPEND}
+	virtual/ttf-fonts
+	media-fonts/stix-fonts
+	media-fonts/texcm-ttf
+	dev-python/pyparsing
+	cairo?  ( dev-python/pycairo )
+	excel?  ( dev-python/xlwt )
+	fltk?   ( dev-python/pyfltk )
+	qt4?    ( dev-python/PyQt4[X] )
+	traits? ( dev-python/traits dev-python/configobj )
+	latex?  (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+	)"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+
+PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
+
+use_setup() {
+	local uword="${2}"
+	[[ -z "${2}" ]] && uword="${1}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_prepare() {
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		configobj = False
+		enthought.traits = False
+		[gui_support]
+		$(use_setup gtk)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+		$(use_setup qt4)
+		$(use_setup fltk)
+		$(use_setup cairo)
+	EOF
+
+	# avoid checks needing a X display
+	sed -i \
+		-e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \
+		-e "s/check_for_tk()/$(use tk && echo True || echo False)/" \
+		setup.py || die "sed setup.py failed"
+
+	# respect FHS:
+	# - mpl-data in /usr/share/matplotlib
+	# - config files in /etc/matplotlib
+	sed -i \
+		-e "/'mpl-data\/matplotlibrc',/d" \
+		-e "/'mpl-data\/matplotlib.conf',/d" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
+		setup.py \
+		|| die "sed setup.py for FHS failed"
+
+	# remove internal copies of pycxx, pyparsing
+	rm -rf CXX lib/matplotlib/pyparsing.py \
+		|| die "removed internal copies failed"
+
+	# bug #334429 - also see  https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
+	# which advise against bakoma fonts
+	sed -i \
+		-e '/fontset/s/cm/stix/' \
+		lib/matplotlib/mpl-data/matplotlib.conf || die
+
+	sed -i \
+		-e 's/matplotlib.pyparsing/pyparsing/g' \
+		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# some fixes to avoid fetching data while compiling examples in tests
+	mv "${WORKDIR}"/sample_data examples/
+	echo "examples.download : False" >> doc/matplotlibrc
+	echo "examples.directory : ${S}/examples/sample_data" >> doc/matplotlibrc
+	echo "examples.download : False" >> matplotlibrc.template
+	echo "examples.directory : ${EPREFIX}/usr/share/${PF}/examples/sample_data" >> matplotlibrc.template
+}
+
+src_compile() {
+	unset DISPLAY # bug #278524
+	distutils_src_compile_pre_hook() {
+		ln -fs "${EPREFIX}/usr/share/python$(python_get_version)/CXX" .
+	}
+	distutils_src_compile
+
+	if use doc; then
+		cd "${S}/doc"
+		export VARTEXFONTS="${T}"/fonts
+		MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+			PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
+			"$(PYTHON -f)" make.py --small all
+		[[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
+	fi
+}
+
+src_test() {
+	# if doc were enabled, all examples were built and tested
+	use doc && return
+	einfo "Tests are quite long, be patient"
+	cd "${S}/examples/tests"
+	testing() {
+		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py agg || return 1
+		PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py --clean
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	# remove fonts bundles except some computer modern ones
+	rm lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf
+	rm lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT}
+	rm lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts}
+
+	# sed only after doc building, to allow using default configs
+	sed -i \
+		-e "s:path =  get_data_path():path = '${EPREFIX}/etc/matplotlib':" \
+		-e "s:os.path.dirname(__file__):'${EPREFIX}/usr/share/${PN}':g" \
+		build-*/lib*/matplotlib/__init__.py \
+		|| die "sed init for FHS failed"
+	distutils_src_install
+
+	# Respect FHS
+	dodir /usr/share/${PN}
+	mv "${ED}$(python_get_sitedir -f)/${PN}/"{mpl-data,backends/Matplotlib.nib} \
+		"${ED}usr/share/${PN}" || die "Renaming failed"
+	rm -fr "${ED}"usr/lib*/python*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
+
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf || die "installing config files failed"
+
+	# doc and examples
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins doc/build/latex/Matplotlib.pdf || die
+		doins -r doc/build/html || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}
--- a/dev-util/ccache/ccache-3.1.6.ebuild
+++ b/dev-util/ccache/ccache-3.1.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.6.ebuild,v 1.1 2011/08/22 00:23:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.6.ebuild,v 1.2 2011/11/25 06:04:12 jer Exp $

 inherit multilib

@ -10,7 +10,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"

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

 RDEPEND="sys-libs/zlib"
--- a/dev-util/cmake/cmake-2.8.6-r4.ebuild
+++ b/dev-util/cmake/cmake-2.8.6-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.2 2011/11/23 20:39:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.3 2011/11/25 06:07:04 jer Exp $

 EAPI=4

@ -14,7 +14,7 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"

 LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"

--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.39 2011/11/21 10:15:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.40 2011/11/24 20:05:01 sera Exp $

 # -----------------------------------------------------------------------------
 # @eclass-begin
@ -68,7 +68,7 @@ java-vm_check-nsplugin() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=

 	# Install a default nsplugin if we don't already have one
-	if has nsplugin ${IUSE} && use nsplugin; then
+	if in_iuse nsplugin && use nsplugin; then
 		if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
 			einfo "No system nsplugin currently set."
 			java-vm_set-nsplugin
@ -150,6 +150,7 @@ set_java_env() {
 		-e "s/@PN@/${PN}/g" \
 		-e "s/@PV@/${PV}/g" \
 		-e "s/@PF@/${PF}/g" \
+		-e "s/@SLOT@/${SLOT}/g" \
 		-e "s/@PLATFORM@/${platform}/g" \
 		-e "s/@LIBDIR@/$(get_libdir)/g" \
 		-e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild,v 1.1 2011/11/07 07:48:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild,v 1.2 2011/11/25 07:51:39 tetromino Exp $

 EAPI="4"

@ -40,3 +40,8 @@ RDEPEND="
 "
 DEPEND=""
 S=${WORKDIR}
+
+pkg_pretend() {
+	elog "See http://www.gentoo.org/proj/en/desktop/gnome/howtos/gnome-3.2-upgrade.xml"
+	elog "for the Gentoo GNOME 3.2 upgrade guide."
+}
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@ -1,3 +1,2 @@
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
-DIST gnome-session-3.0.2.tar.bz2 805690 RMD160 58268528a627ffe9be96e8d168ea278b98c5e693 SHA1 5559a71ef3134f3aaa48b7f06e2123714f71756f SHA256 4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96
 DIST gnome-session-3.2.1.tar.xz 700852 RMD160 ce31f04f2ced486f0bca59e7e64cf1194f401eff SHA1 a330cb69c3a1126ed57d36a58004987275e8982a SHA256 a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3
--- a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.4 2011/09/12 10:35:55 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc ipv6 elibc_FreeBSD"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2:2
-	>=sys-power/upower-0.9.0
-	gnome-base/librsvg:2
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.17
-	>=dev-util/intltool-0.40
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-maintainer-mode
-		--disable-schemas-compile
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions || die "dodir failed"
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome" || die "doexe failed"
-
-	dodir /usr/share/gnome/applications/ || die
-	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list" || die
-
-	dodir /etc/X11/xinit/xinitrc.d/ || die
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome" || die
-
-	# This should be done here as discussed in bug #270852
-	doexe "${FILESDIR}/10-user-dirs-update-gnome"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@ -1,3 +1,2 @@
 DIST libgnomekbd-2.32.0.tar.bz2 410928 RMD160 5ecca30979373f746224693c6b9ff8b6fe2a8e18 SHA1 8401db5d7888185fb3a5855f316771aa09865403 SHA256 ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
-DIST libgnomekbd-3.0.0.1.tar.bz2 428490 RMD160 563fc75183435a1aa7e014dd4cfe344d7bd1cf63 SHA1 c9b52a4136a32fbef8d226f1d86ba2b9313f162c SHA256 727293963847761b7942d9c5c195c317a5f5f18585ebc6d348147924242902e9
 DIST libgnomekbd-3.2.0.tar.xz 376580 RMD160 c7d549c731c57b995c4036d9378a5f33419bfe29 SHA1 c7a0af337df1ba67e3e1824db3191abdd7b6a098 SHA256 810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b
--- a/gnome-base/libgnomekbd/libgnomekbd-3.0.0.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.0.0.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.0.0.1.ebuild,v 1.1 2011/08/14 14:58:21 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=x11-libs/libxklavier-5.1
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		$(use_enable introspection)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@ -1,4 +1,3 @@
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
-DIST nautilus-3.0.2.tar.bz2 5636620 RMD160 f133abc4934e6fec0e2a2688ba5a212e923279a6 SHA1 f2a926132a8f6c21be1a0c931588b7fb526ea04a SHA256 6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22
 DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbff7 SHA1 246c6ae0539dc111d755727ad4cb12d8df7bd322 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
--- a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
+++ b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
@ -1,88 +0,0 @@
-From a37ecf869f4772b1ea3b578b687b5b83dd4bd067 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 27 May 2011 01:10:24 -0400
-Subject: [PATCH] Prevent segfault in gtk_icon_info_load_symbolic when icon is not found (gnome bug 651209)
-
-Users of Gentoo and Fedora have reported segfaults in nautilus-3.0.x
-in gtk_icon_info_load_symbolic (see Gentoo bug 365779, Fedora bug
-690357). One of them was helpful enough to post a backtrace with
-debugging information: https://bugzilla.redhat.com/attachment.cgi?id=489928
-
-The backtrace shows that the crash occurs because we are passing a
-NULL icon_info to gtk_icon_info_load_symbolic in lookup_and_color_symbolic_find
-in nautilus-search-bar.c; indeed, icon_info will be NULL if
-gtk_icon_theme_lookup_icon fails to find an icon.
-
-An identical problem exists in get_eject_icon in nautilus-places-sidebar.c,
-where gtk_icon_info_load_symbolic_for_context and
-gtk_icon_theme_lookup_by_gicon are used.
-
-The solution is to check for the NULL icon_info, and return a
-NULL GdkPixbuf. Note that returning a NULL from
-lookup_and_color_symbolic_find and get_eject_icon is
-safe: in both cases, the return value is only used in functions
-that can safely deal with a NULL.
---
- src/nautilus-places-sidebar.c |   11 ++++++-----
- src/nautilus-search-bar.c     |    9 +++++----
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index aa08f14..de53cd1 100644
--- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -214,7 +214,7 @@ static GdkPixbuf *
- get_eject_icon (NautilusPlacesSidebar *sidebar,
- 		gboolean highlighted)
- {
-	GdkPixbuf *eject;
-+	GdkPixbuf *eject = NULL;
- 	GtkIconInfo *icon_info;
- 	GIcon *icon;
- 	int icon_size;
-@@ -227,10 +227,11 @@ get_eject_icon (NautilusPlacesSidebar *sidebar,
- 	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, icon_size, 0);
- 
- 	style = gtk_widget_get_style_context (GTK_WIDGET (sidebar));
-	eject = gtk_icon_info_load_symbolic_for_context (icon_info,
-							 style,
-							 NULL,
-							 NULL);
-+	if (icon_info != NULL)
-+		eject = gtk_icon_info_load_symbolic_for_context (icon_info,
-+								 style,
-+								 NULL,
-+								 NULL);
- 
- 	if (highlighted) {
- 		GdkPixbuf *high;
-diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
-index 6148807..17412d9 100644
--- a/src/nautilus-search-bar.c
-+++ b/src/nautilus-search-bar.c
-@@ -160,7 +160,7 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
- {
- 	GtkIconInfo *icon_info;
- 	GdkRGBA color;
-	GdkPixbuf *icon;
-+	GdkPixbuf *icon = NULL;
- 	GtkStyleContext *context;
- 
- 	context = gtk_widget_get_style_context (GTK_WIDGET (bar));
-@@ -172,9 +172,10 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
- 						"edit-find-symbolic",
- 						nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU),
- 						GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-	icon = gtk_icon_info_load_symbolic (icon_info, &color,
-					    NULL, NULL, NULL,
-					    NULL, NULL);
-+	if (icon_info != NULL)
-+		icon = gtk_icon_info_load_symbolic (icon_info, &color,
-+						    NULL, NULL, NULL,
-+						    NULL, NULL);
- 
- 	gtk_style_context_restore (context);
- 
-- 
-1.7.5.rc3
-
--- a/gnome-base/nautilus/nautilus-3.0.2.ebuild
+++ b/gnome-base/nautilus/nautilus-3.0.2.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.0.2.ebuild,v 1.2 2011/09/22 15:43:04 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc exif gnome +introspection sendto xmp"
-
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.0.8:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3.0.0:3
-
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	x11-proto/xproto
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	sendto? ( !gnome-extra/nautilus-sendto )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable sendto nst-extension)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	# Gentoo bug #365779 + https://bugzilla.gnome.org/show_bug.cgi?id=651209
-	epatch "${FILESDIR}/${PN}-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch"
-
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
--- a/gnome-extra/drwright/Manifest
+++ b/gnome-extra/drwright/Manifest
@ -1,3 +1,2 @@
 DIST drwright-0.17.tar.bz2 261762 RMD160 e94d4ac0fdca80831766bc242502e9d693e2509f SHA1 dbf75a2adc97fe1ae615a2889420d20ffe4ec2ff SHA256 931529384d58a3493f172cae8416367e01a840cdd624b089901f7e7232582e58
-DIST drwright-3.0.2.tar.bz2 1810125 RMD160 15a59f50157db7ebc30e842ec17a7094649bf76e SHA1 1aa724d030f2cdbce103001d52f6d322e4101a1a SHA256 9640100ac69dcdcab1284602a46b57795207e38ea4e96e62ee711ce29e2dae25
 DIST drwright-3.2.1.tar.xz 1433164 RMD160 660d42f03b2ab77bf484ac366b29d0ce12edb2f4 SHA1 598917be26479722443027f5a22244a7e2ef9395 SHA256 2fed965a895d2377b975fe7e5abd14b9d443e0adf801586c516a99e005619b3c
--- a/gnome-extra/drwright/drwright-3.0.2.ebuild
+++ b/gnome-extra/drwright/drwright-3.0.2.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/drwright/drwright-3.0.2.ebuild,v 1.1 2011/08/19 11:10:13 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME 3 tool that forces you to take regular breaks to prevent RSI"
-HOMEPAGE="http://git.gnome.org/browse/drwright"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=gnome-base/gnome-settings-daemon-2.91.8
-	>=gnome-base/gnome-control-center-2.91.6
-	>=x11-libs/libnotify-0.7
-	media-libs/libcanberra[gtk3]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.12.0
-"
-DOCS="AUTHORS ChangeLog NEWS"
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@ -1,3 +1,2 @@
 DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf
-DIST gnome-color-manager-3.0.0.tar.bz2 3704414 RMD160 2018ab499da9ea65d3644a1739b3c2b92f9290e1 SHA1 51d0efe15b33f144e054096c96eb006e5c616fba SHA256 9e030b2a5dd61010bce25c2e3cdfca6e7ab3954fecb74dbf88f6a8e2c70b7207
 DIST gnome-color-manager-3.2.1.tar.xz 2512124 RMD160 1967a51edd0f19083a33beddb5a0d04be8dc448d SHA1 599615b18b4396419f82d726e1e820c9ee3a98bd SHA256 bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch
+++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch
@ -1,54 +0,0 @@
-From 66e2933c29964e72fa96f95d518763f2b4e95f79 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 13 May 2011 18:32:16 +0000
-Subject: Ensure we cancel the initial panel startup if the panel was created and destroyed without ever getting control of the mainloop
-
-This can happen if you plug in a color sensor, with the color control center
-panel already open.
-In this case, the g-s-d plugin creates a new instance which seemingly gets
-loaded and unloaded and control is returned to to original instance.
-
-A workaround is either to not have the control panel panel open when pushing in
-the device, or to restart the control center after plugging in the hardware.
---
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..898004e 100644
--- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -61,6 +61,7 @@ struct _CcColorPanelPrivate {
- 	GSettings		*settings;
- 	guint			 save_and_apply_id;
- 	guint			 apply_all_devices_id;
-+	guint			 session_startup_id;
- 	GCancellable		*cancellable;
- };
- 
-@@ -2270,6 +2271,7 @@ cc_color_panel_startup_idle_cb (CcColorPanel *panel)
- 	g_debug ("getting installed");
- 	cc_color_panel_is_color_profiles_extra_installed (panel);
- out:
-+	panel->priv->session_startup_id = 0;
- 	g_free (colorspace_rgb);
- 	g_free (colorspace_cmyk);
- 	return FALSE;
-@@ -2452,6 +2454,8 @@ cc_color_panel_finalize (GObject *object)
- 		g_source_remove (panel->priv->save_and_apply_id);
- 	if (panel->priv->apply_all_devices_id != 0)
- 		g_source_remove (panel->priv->apply_all_devices_id);
-+	if (panel->priv->session_startup_id > 0)
-+		g_source_remove (panel->priv->session_startup_id);
- 
- 	G_OBJECT_CLASS (cc_color_panel_parent_class)->finalize (object);
- }
-@@ -2644,7 +2648,8 @@ cc_color_panel_init (CcColorPanel *panel)
- if(0)	cc_color_panel_setup_drag_and_drop (GTK_WIDGET (panel->priv->main_window));
- 
- 	/* do all this after the window has been set up */
-	g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
-+	panel->priv->session_startup_id =
-+		g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
- out:
- 	return;
- }
--
-cgit v0.9
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch
+++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch
@ -1,13 +0,0 @@
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..f4307cc 100644
--- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -2150,7 +2150,7 @@ cc_color_panel_is_color_profiles_extra_installed (CcColorPanel *panel)
- 	GError *error = NULL;
- 
- #ifndef HAVE_PACKAGEKIT
-	g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", package_name);
-+	g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA);
- 	return;
- #endif
- 
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild,v 1.1 2011/08/19 11:09:04 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection packagekit raw scanner"
-
-# FIXME: raise libusb:1 to 1.0.9 when available
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
-	>=dev-libs/libusb-1:1
-	>=gnome-base/gnome-control-center-3
-	gnome-base/gnome-settings-daemon
-
-	media-libs/lcms:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff
-	net-print/cups
-
-	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-	x11-libs/libX11
-	x11-libs/libXrandr
-	>=x11-libs/gtk+-2.91:3
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/vte-0.25.1:2.90
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	scanner? ( media-gfx/sane-backends )
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${RDEPEND}
-	media-gfx/shared-color-profiles
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-"
-
-# FIXME: run test-suite with files on live file-system
-RESTRICT="test"
-
-pkg_setup() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--enable-tests
-		$(use_enable packagekit)
-		$(use_enable introspection)
-		$(use_enable raw exiv)
-		$(use_enable scanner sane)"
-}
-
-src_prepare() {
-	# Fix build
-	epatch "${FILESDIR}/${P}-packagename.patch"
-
-	# Upstream renamed 95-gcm-colorimeters.rules to 69-gcm-colorimeters.rules
-	# for next release (see commit dc276cbe) to fix colorimeter udev ACLs.
-	mv -f rules/{95,69}-gcm-colorimeters.rules || die "mv failed"
-	sed -e 's:95-gcm-colorimeters.rules:69-gcm-colorimeters.rules:' \
-		-i rules/Makefile.* || die "sed rules/Makefile.* failed"
-
-	# Upstream patch to fix a bug in control center panel when plugging in a
-	# colorimeter; will be in next release
-	epatch "${FILESDIR}/${P}-cc-panel.patch"
-
-	gnome2_src_prepare
-}
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@ -9,8 +9,6 @@
 	<use>
 		<flag name="clutter">Use <pkg>media-libs/clutter</pkg> to render color
 			gamut representations</flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
 	</use>
--- a/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
+++ b/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
@ -0,0 +1,42 @@
+gnome-audio-profiles-properties and related files are now provided by
+media-libs/libgnome-media-profiles:3
+
+So we don't build them, or install them to avoid file collisions
+
+---
+--- profiles/Makefile.am
+++ profiles/Makefile.am
+@@ -1,4 +1,3 @@
+-bin_PROGRAMS = gnome-audio-profiles-properties
+ noinst_PROGRAMS =
+ 
+ defines = \
+@@ -21,11 +20,6 @@
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ uidir = $(pkgdatadir)
+-ui_DATA = gnome-audio-profile-new.ui gnome-audio-profile-edit.ui
+-
+-gnome_audio_profiles_properties_SOURCES = gnome-audio-profiles-properties.c
+-gnome_audio_profiles_properties_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
+-gnome_audio_profiles_properties_LDADD = libgnome-media-profiles.la $(GMP_LIBS)
+ 
+ libgnome_media_profiles_la_SOURCES = \
+ 	audio-profile.c \
+@@ -67,15 +61,8 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gnome-media-profiles.pc
+-EXTRA_DIST = $(ui_DATA) $(schema_DATA) $(pkgconfig_DATA)
+EXTRA_DIST = $(schema_DATA) $(pkgconfig_DATA)
+ 
+ CLEANFILES = $(schema_DATA)
+ 
+-# "." is dirty hack to first build our .la in this dir before moving to glade
+-SUBDIRS =  . help
+-
+-if HAVE_GLADEUI
+-SUBDIRS += glade
+-endif
+-
+ -include $(top_srcdir)/git.mk
--- a/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild,v 1.1 2011/11/25 06:54:55 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# NOTE: This package provides the following:
+#  * libgnome-media-profiles.so.0
+#  * gstreamer-properties
+#  * gnome-sound-recorder
+#  * gnome-audio-profiles
+# NOTE: It has /stopped/ providing the following:
+#  * gnome-volume-control (moved to gnome-control-center)
+#  * gstmixer (won't work under GNOME 3, even in classic-gnome)
+#  * gnome-audio-profile-properties (moved to libgnome-media-profiles)
+RDEPEND="dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.18.0:2
+	>=gnome-base/gconf-2.6.1:2
+	>=media-libs/gstreamer-0.10.23:0.10
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-libs/gst-plugins-good-0.10:0.10
+	>=media-libs/libcanberra-0.13[gtk]
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
+	>=dev-libs/libunique-1:1
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35.0"
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--enable-profiles
+		--disable-pulseaudio
+		--disable-gstmix"
+	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+	# This has been moved to media-libs/libgnome-media-profiles:3,
+	# but the library libgnome-media-profiles.so.0 is still used
+	epatch "${FILESDIR}/${P}-disable-gnome-audio-profile-properties.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# These files are now provided by gnome-control-center-2.91's sound applet
+	# These won't be used if gnome-volume-control is not installed
+	rm -v "${ED}"/usr/share/sounds/gnome/default/alerts/*.ogg || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@ -1,4 +1,3 @@
 DIST gnome-power-manager-2.32.0-keyboard-backlight.patch.xz 16632 RMD160 51e545ac23057deaa6997042f263b9073bf5d324 SHA1 73b7eda2ee700b1084fbc40318128f6d0b4adb14 SHA256 3f57906b0fea33ab1e6fa20e8772ae7dd685413a7ae64e182b15a80bc4d1a58b
 DIST gnome-power-manager-2.32.0.tar.bz2 3892164 RMD160 77e8b95ba6d34d83b94b410d860f23d2efb953c8 SHA1 829d65addba1dc3a7e91ebb871525dc16223a082 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
-DIST gnome-power-manager-3.0.2.tar.bz2 4081620 RMD160 b4d32f03453c4939bc1b847a691d0d6a8a86cb07 SHA1 dbbce43c1b418f6d9d8b5b80ac6ba741e2e6efbf SHA256 d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b
 DIST gnome-power-manager-3.2.1.tar.xz 734932 RMD160 727a3f97f602058c629f911f74aef3d0b182def5 SHA1 d2ea72da27dc2129f4d1a1b9d4a98d3b90fde1cb SHA256 11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
@ -1,31 +0,0 @@
-From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 02 May 2011 23:18:58 +0000
-Subject: gpm-idle: manually update the status property
-
-gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
-therefore we need to manually update the cached property when
-receiving a SessionChanged signal.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=679083
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
---
-diff --git a/src/gpm-idle.c b/src/gpm-idle.c
-index 04225fc..0f2f1ee 100644
--- a/src/gpm-idle.c
-+++ b/src/gpm-idle.c
-@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
- 		return;
- 	}
- 	if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
-+                guint status;
-+
-+                g_variant_get (parameters, "(u)", &status);
-+                g_dbus_proxy_set_cached_property (proxy, "status",
-+                                                  g_variant_new ("u", status));
- 		g_debug ("Received gnome session status change");
- 		gpm_idle_evaluate (idle);
- 		return;
--
-cgit v0.9
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
@ -1,146 +0,0 @@
-From c36c35b2ecd818e54de975fe81885eca05a1be98 Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <chingpang@gmail.com>
-Date: Wed, 08 Jun 2011 16:01:33 +0000
-Subject: Query gnome-screensaver settings with GSettings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650464
---
-diff --git a/configure.ac b/configure.ac
-index 90bbe5f..3134ae4 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
- 
- PKG_CHECK_MODULES(GNOME, [
-  gtk+-3.0 >= 2.91.0
- gconf-2.0 >= 2.31.1
-  gnome-keyring-1 >= 0.6.0
-  cairo >= 1.0.0])
- 
-diff --git a/src/gpm-common.h b/src/gpm-common.h
-index b540c05..dabda1a 100644
--- a/src/gpm-common.h
-+++ b/src/gpm-common.h
-@@ -129,8 +129,8 @@ G_BEGIN_DECLS
- #define GPM_SETTINGS_INFO_LAST_DEVICE			"info-last-device"
- 
- /* gnome-screensaver */
-#define GS_CONF_DIR					"/apps/gnome-screensaver"
-#define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
-+#define GS_SETTINGS_SCHEMA				"org.gnome.desktop.screensaver"
-+#define GS_SETTINGS_PREF_LOCK_ENABLED			"lock-enabled"
- 
- typedef enum {
- 	GPM_ICON_POLICY_PRESENT,
-diff --git a/src/gpm-control.c b/src/gpm-control.c
-index 0fc864d..902db44 100644
--- a/src/gpm-control.c
-+++ b/src/gpm-control.c
-@@ -38,7 +38,6 @@
- 
- #include <glib/gi18n.h>
- #include <gnome-keyring.h>
-#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
- 
- #include "egg-console-kit.h"
-@@ -51,8 +50,8 @@
- 
- struct GpmControlPrivate
- {
-	GConfClient		*conf;
- 	GSettings		*settings;
-+	GSettings		*settings_ss;
- 	UpClient		*client;
- };
- 
-@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
- 	   See bug #331164 for all the juicy details. :-) */
- 	use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
- 	if (use_ss_setting) {
-		do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+		do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
- 		g_debug ("Using ScreenSaver settings (%i)", do_lock);
- 	} else {
- 		do_lock = g_settings_get_boolean (control->priv->settings, policy);
-@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
- 	g_return_if_fail (GPM_IS_CONTROL (object));
- 	control = GPM_CONTROL (object);
- 
-	g_object_unref (control->priv->conf);
- 	g_object_unref (control->priv->settings);
-+	g_object_unref (control->priv->settings_ss);
- 	g_object_unref (control->priv->client);
- 
- 	g_return_if_fail (control->priv != NULL);
-@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
- 
- 	control->priv->client = up_client_new ();
- 	control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
-	control->priv->conf = gconf_client_get_default ();
-+	control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
- }
- 
- /**
-diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
-index 842ea7c..f41baed 100644
--- a/src/gpm-screensaver.c
-+++ b/src/gpm-screensaver.c
-@@ -25,7 +25,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
-#include <gconf/gconf-client.h>
- 
- #include "gpm-screensaver.h"
- #include "gpm-common.h"
-@@ -41,7 +40,7 @@ static void     gpm_screensaver_finalize   (GObject		*object);
- struct GpmScreensaverPrivate
- {
- 	GDBusProxy		*proxy;
-	GConfClient		*conf;
-+	GSettings		*settings;
- };
- 
- enum {
-@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
- {
- 	gboolean enabled;
- 	g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
-	enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+	enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
- 	return enabled;
- }
- 
-@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
- 		g_warning ("failed to setup screensaver proxy: %s", error->message);
- 		g_error_free (error);
- 	}
-	screensaver->priv->conf = gconf_client_get_default ();
-+	screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
- }
- 
- /**
-@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
- 	screensaver = GPM_SCREENSAVER (object);
- 	screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
- 
-	g_object_unref (screensaver->priv->conf);
-+	g_object_unref (screensaver->priv->settings);
- 	g_object_unref (screensaver->priv->proxy);
- 
- 	G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
-diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
-index e7eb21b..a444c2e 100644
--- a/src/gpm-statistics.c
-+++ b/src/gpm-statistics.c
-@@ -27,7 +27,6 @@
- #include <glib/gi18n.h>
- 
- #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
- 
- #include "gpm-array-float.h"
--
-cgit v0.9
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild,v 1.1 2011/08/19 10:49:13 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-# Latest libcanberra is needed due to gtk+:3 API changes
-COMMON_DEPEND=">=dev-libs/glib-2.25.9
-	>=x11-libs/gtk+-2.91.7:3
-	>=gnome-base/gnome-keyring-0.6.0
-	>=x11-libs/libnotify-0.7.0
-	>=x11-libs/cairo-1.0.0
-	>=gnome-base/gconf-2.31.1:2
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	>=sys-power/upower-0.9.1
-	>=x11-apps/xrandr-1.3
-	>=x11-proto/xproto-7.0.15
-	x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/consolekit-0.4[policykit]
-	sys-auth/polkit
-	gnome-extra/polkit-gnome"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/randrproto
-
-	sys-devel/gettext
-	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )
-	test? ( sys-apps/dbus )"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
-		--disable-strict
-		--enable-compile-warnings=minimum
-		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	if ! use doc; then
-		G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=679083
-	# will be in next release
-	epatch "${FILESDIR}/${P}-idle-status.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=650464
-	# will be in next release
-	epatch "${FILESDIR}/${P}-screensaver.patch"
-
-	# Drop debugger CFLAGS from configure
-	# XXX: touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@ -1,5 +1,3 @@
 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
 DIST gnome-screensaver-2.30.2.tar.bz2 4814653 RMD160 1b13722f3bebca709b9f44c45e995d07ed6c2044 SHA1 f9d7c0df0efaa6916099ca56078da8b36f4c4935 SHA256 dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
-DIST gnome-screensaver-3.0.0.tar.bz2 646056 RMD160 3639a0b146c68316835e3cacb82d08a8ff9c2eca SHA1 8070e916d66a381334be2ca11b4b8e4c378c0a08 SHA256 e00e801d94c1d9f1e62049f77b91d822047eb1dcbd2e01cc38b5dd1b0f67c948
-DIST gnome-screensaver-3.0.1.tar.bz2 654661 RMD160 22c63e764c67bec2e087738acc41153af00afd44 SHA1 16fedbe7b0821f51011d9f026f8b6d7ed562ab47 SHA256 f853d91ad9054dcd6f0219c6a629e36b8f6f0df932ddfc7786493571a37556bf
 DIST gnome-screensaver-3.2.0.tar.xz 566084 RMD160 cb21d95961763fcb831a9b1293569c04bc3deacb SHA1 69c87cd60f76a3a6626970c3dd3fd8f72fda542f SHA256 305f4a5be8736c4cf5e55b8288b7e177907bafa26e39273d1bb65ad1862295ed
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
@ -1,100 +0,0 @@
-From 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 20 Jul 2011 18:00:43 +0000
-Subject: gs-window-x11: shorten clock timeout to detect skew
-
-The timer for the panel clock currently wakes up once a minute in
-the default case.  This means, if the clock changes while the
-screen is locked (say from a resume following suspend, or from
-ntp) then it becomes out of date for up to a minute.
-
-There's no good way right now to detect when clock skew happens,
-so this commit changes the timeout to expire every couple of
-seconds instead of once a minute.
-
-Minor-Updates-By: Ray Strode <rstrode@redhat.com>
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
---
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index e7a475e..a723c4d 100644
--- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -101,6 +102,8 @@ struct GSWindowPrivate
-         guint      info_bar_timer_id;
-         guint      clock_update_id;
- 
-+        gint64     clock_update_time;
-+
-         gint       lock_pid;
-         gint       lock_watch_id;
-         gint       dialog_response;
-@@ -2201,7 +2204,8 @@ update_clock (GSWindow *window)
-                 /* Translators, this is the 12h date format used in the panel clock */
-                 clock_format = _("%a %l:%M %p");
- 
-        dt = g_date_time_new_now_local ();
-+        window->priv->clock_update_time = g_get_real_time ();
-+        dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
-         text = g_date_time_format (dt, clock_format);
-         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
-         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-@@ -2219,6 +2223,28 @@ update_clock_timer (GSWindow *window)
-         return FALSE;
- }
- 
-+static gboolean
-+check_clock_timer (GSWindow *window)
-+{
-+        /* Update the panel clock when necessary.
-+           This happens:
-+
-+           - Once a minute in the normal case
-+           - When the machine resumes from suspend
-+           - When the system time is adjusted
-+
-+           Right now this function is called much more frequently than any of the
-+           above 3 events happen (see queue_clock_update ()).
-+
-+           We can wake up less often if bug 655129 gets fixed.  */
-+        if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
-+                update_clock (window);
-+        }
-+
-+        queue_clock_update (window);
-+        return FALSE;
-+}
-+
- static void
- queue_clock_update (GSWindow *window)
- {
-@@ -2228,10 +2254,17 @@ queue_clock_update (GSWindow *window)
-         gettimeofday (&tv, NULL);
-         timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
- 
-        /* timeout of one minute if we don't care about the seconds */
-+        /* time until next minute */
-         timeouttime += 1000 * (59 - tv.tv_sec % 60);
- 
-        window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        /* If we are more than 2.5 seconds from the start of the next minute,
-+           schedule less precise but more power friendly 2 second add_seconds
-+           timeout to check if the system realtime clock has changed under us. */
-+        if (timeouttime > 2500) {
-+                window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
-+        } else {
-+                window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        }
- }
- 
- static char *
--
-cgit v0.9
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
@ -1,28 +0,0 @@
-From 338b86c4f0c2cdc4241dbf5cda913f0184afc105 Mon Sep 17 00:00:00 2001
-From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
-Date: Tue, 26 Apr 2011 17:15:56 +0000
-Subject: dialog: Fix crash in user switcher code
-
-The user switch button currently causes the lock dialog to crash
-because of an inverted conditional in the error checking code.
-
-This commit addresses the crash by performing the proper check
-in the conditional.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648234
---
-diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
-index 67ab36a..6706fde 100644
--- a/src/gs-lock-plug.c
-+++ b/src/gs-lock-plug.c
-@@ -167,7 +167,7 @@ do_user_switch (GSLockPlug *plug)
-         g_object_unref (context);
-         g_object_unref (app);
- 
-        if (!error) {
-+        if (error != NULL) {
-                 gs_debug ("Unable to start GDM greeter: %s", error->message);
-                 g_error_free (error);
-         }
--
-cgit v0.9
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
@ -1,44 +0,0 @@
-From 742b77d217dced55b8b07616bf6a70ec167ffc01 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 25 Jul 2011 15:03:00 +0000
-Subject: gs-window-x11: use g_timeout_add_seconds for watch dog
-
-The watch dog timer runs sort of arbitrarily every 30 seconds.
-We don't need much precision on when it runs, it just needs to
-run once in a while.
-
-This commit changes the timer setup call from g_timeout_add
-to g_timeout_add_seconds so the watch dog will wake up with
-any other pending timeouts that happen to expire around the same
-time, saving a little power.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
---
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 5120476..e7a475e 100644
--- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -481,9 +481,9 @@ static void
- add_watchdog_timer (GSWindow *window,
-                     glong     timeout)
- {
-        window->priv->watchdog_timer_id = g_timeout_add (timeout,
-                                                         (GSourceFunc)watchdog_timer,
-                                                         window);
-+        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
-+                                                                 (GSourceFunc)watchdog_timer,
-+                                                                 window);
- }
- 
- static void
-@@ -671,7 +671,7 @@ gs_window_real_show (GtkWidget *widget)
-         window->priv->timer = g_timer_new ();
- 
-         remove_watchdog_timer (window);
-        add_watchdog_timer (window, 30000);
-+        add_watchdog_timer (window, 30);
- 
-         select_popup_events ();
-         window_select_shape_events (window);
--
-cgit v0.9
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild,v 1.1 2011/08/19 11:43:42 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable pam locking)
-		--with-mit-ext
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--disable-schemas-compile"
-	# xscreensaver and custom screensaver capability removed
-	# poke and inhibit commands were also removed, bug 579430
-}
-
-src_prepare() {
-	# Upstream patch to fix crash in user switcher; will be in next release
-	epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
-
-	# Upstream patches to fix timers and update the clock properly; will be
-	# in next release
-	epatch "${FILESDIR}/${P}-watchdog-add_seconds.patch"
-	epatch "${FILESDIR}/${P}-clock-skew.patch"
-
-	gnome2_src_prepare
-}
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild,v 1.1 2011/09/15 21:03:31 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable pam locking)
-		--with-mit-ext
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--disable-schemas-compile"
-	# xscreensaver and custom screensaver capability removed
-	# poke and inhibit commands were also removed, bug 579430
-}
-
-src_prepare() {
-	# Upstream patches to fix timers and update the clock properly; will be
-	# in next release
-	epatch "${FILESDIR}/${PN}-3.0.0-watchdog-add_seconds.patch"
-	epatch "${FILESDIR}/${PN}-3.0.0-clock-skew.patch"
-
-	gnome2_src_prepare
-}
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch
@ -0,0 +1,27 @@
+commit 77b1374b99ee91d23d8802dd1dec9a5f630e919a
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Wed Nov 9 20:15:50 2011 +0100
+
+    only delete the layout when it isn't assigned to another layout
+    
+    based on the patch by Raul Fernandes
+    BUG:275286
+
+diff --git a/plasma/desktop/applets/tasks/taskgroupitem.cpp b/plasma/desktop/applets/tasks/taskgroupitem.cpp
+index 6b23b71..d7816d3 100644
+--- a/plasma/desktop/applets/tasks/taskgroupitem.cpp
+++ b/plasma/desktop/applets/tasks/taskgroupitem.cpp
+@@ -79,8 +79,11 @@ TaskGroupItem::TaskGroupItem(QGraphicsWidget *parent, Tasks *applet)
+ 
+ TaskGroupItem::~TaskGroupItem()
+ {
+-    delete m_tasksLayout;
+-    m_tasksLayout = 0;
+    if (!m_offscreenLayout && !m_mainLayout) {
+        // only delete this if we have neither an offscreen layout or a mainlayout
+        // if we do, then they will delete the layout for us.
+        delete m_tasksLayout;
+    }
+ }
+ 
+ bool TaskGroupItem::isSplit()
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r5.ebuild,v 1.1 2011/11/22 22:49:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild,v 1.1 2011/11/24 22:33:17 dilfridge Exp $

 EAPI=4

@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-calendarcrash.patch"
+	"${FILESDIR}/${PN}-4.7.3-layoutcrash.patch"
 )

 pkg_setup() {
--- a/kde-misc/kosd/Manifest
+++ b/kde-misc/kosd/Manifest
@ -1 +1,2 @@
 DIST 81457-kosd-0.7.1.tar.bz2 25304 RMD160 368f54a46341462e73875d36b1b88e98eae87161 SHA1 f5118909255421944066b867ae4dcdb3d9681c42 SHA256 9c6586420dabbab2a48e4ce8063c346c050503a8be8cb37b63c042fcf805cf3f
+DIST 81457-kosd-0.8.1.tar.bz2 26082 RMD160 4e863afa1a13c03caec21dbb91375f43728f2479 SHA1 b2916f5842cbe3b79e810b5357c11dad1211759d SHA256 42020b1ba03dca901f094b7077300bec5dd49385720bddfb196febab58cf147e
--- a/kde-misc/kosd/kosd-0.8.1.ebuild
+++ b/kde-misc/kosd/kosd-0.8.1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kosd/kosd-0.8.1.ebuild,v 1.1 2011/11/24 21:35:30 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="KDE application that runs in the background and responds to button presses by showing a tiny OSD"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/KOSD?content=81457"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/81457-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdebase_dep solid)
+	$(add_kdebase_dep kmix)
+"
+RDEPEND="${DEPEND}"
--- a/media-sound/kaudiocreator/kaudiocreator-1.3.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3.ebuild
@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/kaudiocreator-1.3.ebuild,v 1.1 2011/09/25 19:26:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/kaudiocreator-1.3.ebuild,v 1.2 2011/11/24 19:02:48 reavertm Exp $

 EAPI=4
+
+KDE_LINGUAS="af ar be bg br bs ca ca@valencia cs cy da de el en_GB eo es et eu fa fi fr ga gl hi hne hr is it ja kk km lt lv mai mk ms nb nds ne nl nn oc pa pl pt_BR pt ro ru se sk sl sr@ijekavianlatin sr@ijekavian sr@latin sr sv ta tg th tr ug uk xh zh_CN zh_HK zh_TW"
 inherit kde4-base

 DESCRIPTION="KDE CD ripper and audio encoder frontend"
@ -14,13 +16,17 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"

-RDEPEND="
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-"
-DEPEND="${RDEPEND}
+COMMON_DEPEND="
 	$(add_kdebase_dep libkcddb)
 	$(add_kdebase_dep libkcompactdisc)
 	media-libs/libdiscid
-	>=media-libs/taglib-1.5"
+	>=media-libs/taglib-1.5
+"

-DOCS=( Changelog TODO )
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
+	$(add_kdebase_dep kdemultimedia-kioslaves)
+"
+DEPEND="${COMMON_DEPEND}"
+
+DOCS=(Changelog TODO)
--- a/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild,v 1.3 2011/11/03 18:36:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild,v 1.4 2011/11/25 07:20:34 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="yes"
@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"

 COMMON_DEPEND=">=dev-libs/glib-2.18:2
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@ -1 +1,2 @@
 DIST tomahawk-0.3.0.tar.bz2 4602076 RMD160 4b1c1c27384378d6a408fcd4f11e947ccfe8210f SHA1 51651e41b8b01e6e2f90a5942b02d97abb52243e SHA256 207c27ae7d5a6735911587b07d38af0e84a76082b211e7fbf245de323e1cee6f
+DIST tomahawk-0.3.2.tar.bz2 4635563 RMD160 8d399b1467a974ea0efc05ba73d83435f5e227f3 SHA1 6559985ebb875f2ebd63320e46b11ba1666b703d SHA256 9835011e6dd6d065a8b8df78f1e9586d3c6b3842f238fd6ea92da417819567f2
--- a/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
+++ b/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
@ -0,0 +1,184 @@
+From 01d13bec7a3cd33bb815968012d1f00c7eb3e700 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gmx.de>
+Date: Thu, 24 Nov 2011 15:10:41 +0100
+Subject: [PATCH] Patch clucene
+
+---
+ CMakeModules/FindCLucene.cmake |   97 ++++++++++++++--------------------------
+ src/libtomahawk/CMakeLists.txt |    2 +-
+ 2 files changed, 35 insertions(+), 64 deletions(-)
+
+diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake
+index 1d5e8d9..906afcc 100644
+--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
+@@ -2,10 +2,9 @@
+ # This module looks for clucene (http://clucene.sf.net) support
+ # It will define the following values
+ #
+-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
+ # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
+ # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
+-# CLUCENE_LIBRARIES    = the libraries to link against CLucene
+# CLUCENE_LIBRARY      = the library to link against CLucene
+ # CLUCENE_VERSION      = The CLucene version string
+ # CLucene_FOUND        = set to 1 if clucene is found
+ #
+@@ -13,21 +12,9 @@
+ INCLUDE(CheckSymbolExists)
+ INCLUDE(FindLibraryWithDebug)
+ 
+-# try to locate a patched unstable version (for comp's sake *sigh*) first
+-FIND_PACKAGE(CLuceneUnstable)
+-IF(CLUCENEUNSTABLE_FOUND)
+-    SET(CLucene_FOUND TRUE)
+-    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
+-    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
+-    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
+-
+-    #MESSAGE(FATAL_ERROR NARF)
+-ELSE(CLUCENEUNSTABLE_FOUND)
+-IF(CLucene_FIND_VERSION)
+-  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
+-ELSEIF()
+-  SET(CLUCENE_MIN_VERSION "0.9.23")
+-ENDIF(CLucene_FIND_VERSION)
+if(NOT CLUCENE_MIN_VERSION)
+  set(CLUCENE_MIN_VERSION "0.9.19")
+endif(NOT CLUCENE_MIN_VERSION)
+ 
+ IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
+@@ -36,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ SET(TRIAL_LIBRARY_PATHS
+   $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+   ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  ${CMAKE_LIBRARY_PATH}
+   /usr/local/lib${LIB_SUFFIX}
+  /opt/local/lib${LIB_SUFFIX}
+   /usr/lib${LIB_SUFFIX}
+   /sw/lib${LIB_SUFFIX}
+   /usr/pkg/lib${LIB_SUFFIX}
+-  /usr/lib64
+   )
+ SET(TRIAL_INCLUDE_PATHS
+   $ENV{CLUCENE_HOME}/include
+@@ -50,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
+   /sw/include
+   /usr/pkg/include
+   )
+-FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
+-  WIN32_DEBUG_POSTFIX d
+-  NAMES clucene-core
+-  PATHS ${TRIAL_LIBRARY_PATHS})
+-IF (CLUCENE_CORE_LIBRARY)
+-  MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
+-ENDIF (CLUCENE_CORE_LIBRARY)
+-FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+   WIN32_DEBUG_POSTFIX d
+-  NAMES clucene-shared
+  NAMES clucene clucene-core
+   PATHS ${TRIAL_LIBRARY_PATHS})
+-IF (CLUCENE_SHARED_LIBRARY)
+-  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
+-ENDIF (CLUCENE_SHARED_LIBRARY)
+-
+-IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+-  SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
+-ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+-
+IF (CLUCENE_LIBRARY)
+  MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
+ENDIF (CLUCENE_LIBRARY)
+ FIND_PATH(CLUCENE_INCLUDE_DIR
+   NAMES CLucene.h
+   PATHS ${TRIAL_INCLUDE_PATHS})
+@@ -83,39 +59,35 @@ ENDIF(WIN32)
+ 
+ SET(CLUCENE_GOOD_VERSION TRUE)
+ 
+GET_FILENAME_COMPONENT(_CLUCENE_LIBDIR ${CLUCENE_LIBRARY} PATH)
+ FIND_PATH(CLUCENE_LIBRARY_DIR
+-	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
+-       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+  NAMES CLucene/clucene-config.h PATHS ${CLUCENE_INCLUDE_DIR} ${_CLUCENE_LIBDIR} NO_DEFAULT_PATH)
+ IF (CLUCENE_LIBRARY_DIR)
+   MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+-  # include CLuceneConfig/CLuceneConfig.cmake
+-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+-  # include CLucene/CLuceneConfig.cmake
+-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+-  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+-    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+-    SET(CLUCENE_GOOD_VERSION FALSE)
+-  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+-  IF (CLUCENE_VERSION STREQUAL "0.9.17")
+-    MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+-    SET(CLUCENE_GOOD_VERSION FALSE)
+-  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+  FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+  STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
+  IF (CLMATCH)
+    STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
+	IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+	  MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+      SET(CLUCENE_GOOD_VERSION FALSE)
+	ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+	IF (CLUCENE_VERSION STREQUAL "0.9.17")
+	  MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+      SET(CLUCENE_GOOD_VERSION FALSE)
+	ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+  ENDIF (CLMATCH)
+ELSE (CLUCENE_LIBRARY_DIR)
+  MESSAGE(STATUS "CLucene library dir not found.")
+ ENDIF (CLUCENE_LIBRARY_DIR)
+ 
+-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+   SET(CLucene_FOUND TRUE)
+-  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
+-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+-
+-ENDIF(CLUCENEUNSTABLE_FOUND)
+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+ 
+ IF(CLucene_FOUND)
+   IF(NOT CLucene_FIND_QUIETLY)
+-    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
+    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
+   ENDIF(NOT CLucene_FIND_QUIETLY)
+ ELSE(CLucene_FOUND)
+   IF(CLucene_FIND_REQUIRED)
+@@ -124,8 +96,7 @@ ELSE(CLucene_FOUND)
+ ENDIF(CLucene_FOUND)
+ 
+ MARK_AS_ADVANCED(
+-  CLUCENE_INCLUDE_DIRS
+-  CLUCENE_INCLUDE_DIR
+-  CLUCENE_LIBRARY_DIR
+-  CLUCENE_LIBRARIES
+  CLUCENE_INCLUDE_DIR 
+  CLUCENE_LIBRARY_DIR 
+  CLUCENE_LIBRARY 
+   )
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index ace7438..82c587b 100644
+--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
+@@ -645,7 +645,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
+     ${QJSON_LIBRARIES}
+     ${PHONON_LIBS}
+     ${TAGLIB_LIBRARIES}
+-    ${CLUCENE_LIBRARIES}
+    ${CLUCENE_LIBRARY}
+     ${LIBECHONEST_LIBRARY}
+     ${QT_QTUITOOLS_LIBRARY}
+     ${QT_LIBRARIES}
+-- 
+1.7.8.rc3
+
--- a/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
+++ b/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
@ -0,0 +1,35 @@
+From 683274cace247ba9ca5b972f37ffd4d40d8892fa Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gmx.de>
+Date: Thu, 24 Nov 2011 15:13:38 +0100
+Subject: [PATCH 2/2] Remove internal quazip hack
+
+---
+ CMakeLists.txt |   12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 070db41..0e15c61 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -110,18 +110,6 @@ macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fe
+ macro_optional_find_package(QuaZip)
+ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
+ 
+-IF( NOT QuaZip_FOUND )
+-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
+-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
+-    SET( QuaZip_LIBRARY quazip )
+-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
+-    SET( QuaZip_FOUND true )
+-    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
+-
+-    # copy headers to build/quazip so we can use proper includes inside the code
+-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
+-ENDIF()
+-
+ # required
+ #While we distribute our own liblastfm2, don't need to look for it
+ #macro_optional_find_package(LibLastFm 0.3.3)
+-- 
+1.7.8.rc3
+
--- a/media-sound/tomahawk/tomahawk-0.3.2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.3.2.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.3.2.ebuild,v 1.1 2011/11/24 21:30:49 dilfridge Exp $
+
+EAPI=4
+
+QT_MINIMAL="4.7.0"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-2"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils qt4-r2 ${GIT_ECLASS}
+
+DESCRIPTION="Qt playdar social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="debug fftw jabber libsamplerate +resolver twitter"
+
+DEPEND="
+	>=dev-cpp/clucene-2.3.3.4
+	>=dev-libs/boost-1.41
+	>=dev-libs/qjson-0.7.1
+	>=media-libs/libechonest-1.1.10
+	>=media-libs/phonon-4.5.0[gstreamer]
+	media-libs/taglib
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite]
+	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	>=x11-libs/qt-xmlpatterns-${QT_MINIMAL}:4
+	fftw? ( sci-libs/fftw:3.0 )
+	jabber? ( net-libs/jreen )
+	libsamplerate? ( media-libs/libsamplerate )
+	resolver? (
+		dev-libs/libattica
+		>=dev-libs/quazip-0.4.3
+	)
+	twitter? ( net-libs/qtweetlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-clucene.patch"
+	"${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with jabber Jreen)
+		$(cmake-utils_use_with resolver LibAttica)
+		$(cmake-utils_use_with resolver QuaZip)
+		$(cmake-utils_use_with twitter QTweetLib)
+		-DINTERNAL_JREEN=OFF
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=(	-DBUILD_RELEASE=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	if ! use resolver; then
+		echo
+		elog "Information on how to get more resolvers for ${PN}"
+		elog "is available at ${HOMEPAGE}resolvers"
+		echo
+	fi
+}
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.1 2011/11/12 19:22:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.2 2011/11/24 21:30:49 dilfridge Exp $

 EAPI=4

@ -48,8 +48,8 @@ DEPEND="
 RDEPEND="${DEPEND}"

 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-clucene.patch"
-	"${FILESDIR}/${PN}-0.3.0-remove-quazip.patch"
+	"${FILESDIR}/${PN}-0.3.2-clucene.patch"
+	"${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
 )

 src_configure() {
--- a/media-video/devede/Manifest
+++ b/media-video/devede/Manifest
@ -1,2 +1,3 @@
 DIST devede-3.16.9.tar.bz2 2368434 RMD160 c3bf9b833d503f8d7606918d19a972f98c62e98f SHA1 6b871534a647bf5126e79f1b31394b85b7e66026 SHA256 eccaba86893935ff898e7b26d772214403362a6c8d729645778146560c1ac0c1
 DIST devede-3.17.0.tar.bz2 2370362 RMD160 52783a11b10a000109947e9ebc4347be599de680 SHA1 b9a9043b32289cd6a6dc7d3eeb1e7a094404621b SHA256 528acc83302aec65137f985f32a604cfb416122546827064f7ed54ebafcc4985
+DIST devede-3.18.0.tar.bz2 2415789 RMD160 a5ce79c7b8db562aa49c9c84cc363a502227456b SHA1 99a4c635df48de5899fa811c0f78c06dd07c1a65 SHA256 82a57c9f2e84f170d1553a1feb9b864449f29f7d27bc30761c3d43dba6797f04
--- a/media-video/devede/devede-3.18.0.ebuild
+++ b/media-video/devede/devede-3.18.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/devede/devede-3.18.0.ebuild,v 1.1 2011/11/24 21:08:00 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit multilib python
+
+DESCRIPTION="Program to create video CDs and DVDs, suitable to be played in home DVD players."
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="http://www.rastersoft.com/descargas/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	>=dev-python/pygtk-2.16
+	>=media-video/mplayer-1.0_rc1
+	ffmpeg? ( virtual/ffmpeg )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
+src_install() {
+	./install.sh prefix="/usr" libdir="/usr/$(get_libdir)" \
+		pkgdocdir="/usr/share/doc/${PF}" DESTDIR="${D}" \
+		|| die "install.sh failed."
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+	elog "To create DIVX/MPEG4 files, be sure that MPlayer is compiled with LAME support."
+	elog "In this case you want to check for both the encode and mp3 USE flags."
+	elog "To change the font used to render the subtitles, choose a TrueType font you like"
+	elog "and copy it in \$HOME/.spumux directory, renaming it to devedesans.ttf."
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
--- a/metadata/cache/app-cdr/cdrdao-1.2.3
+++ b/metadata/cache/app-cdr/cdrdao-1.2.3
@ -1,22 +0,0 @@
-virtual/cdrtools encode? ( >=media-sound/lame-3.90 ) gcdmaster? ( dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomeuimm-2.6:2.6 media-libs/libao ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc dev-util/pkgconfig pccts? ( >=dev-util/pccts-1.33.24-r1 )
-virtual/cdrtools encode? ( >=media-sound/lame-3.90 ) gcdmaster? ( dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomeuimm-2.6:2.6 media-libs/libao ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc
-0
-mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2
-
-http://cdrdao.sourceforge.net/
-GPL-2
-Burn CDs in disk-at-once mode -- with optional GUI frontend
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
-eutils multilib portability toolchain-funcs user
-gcdmaster encode pccts mad vorbis
-
-
-
-2
-
-configure install prepare
-
-
-
-
-
--- a/metadata/cache/app-cdr/xfburn-0.4.3-r3
+++ b/metadata/cache/app-cdr/xfburn-0.4.3-r3
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.8.0
+>=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
+0
+mirror://xfce/src/apps/xfburn/0.4/xfburn-0.4.3.tar.bz2 mirror://debian/pool/main/x/xfburn/xfburn_0.4.3-4.debian.tar.gz
+
+http://goodies.xfce.org/projects/applications/xfburn
+GPL-2
+GTK+ based CD and DVD burning application
+~amd64 ~ppc ~x86
+autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
+debug gstreamer udev
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/app-emacs/teco-7
+++ b/metadata/cache/app-emacs/teco-7
@ -0,0 +1,22 @@
+>=virtual/emacs-21
+>=virtual/emacs-21
+0
+mirror://gentoo/teco-7.el.bz2
+
+http://www.emacswiki.org/emacs/TECO
+public-domain
+TECO interpreter for GNU Emacs
+~amd64 ~x86
+elisp elisp-common eutils multilib portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/app-forensics/afflib-3.6.12
+++ b/metadata/cache/app-forensics/afflib-3.6.12
@ -1,5 +1,5 @@
-dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) python? ( dev-lang/python ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) python? ( dev-lang/python ) readline? ( sys-libs/readline ) s3? ( net-misc/curl )
+dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
 0
 http://www.afflib.org/downloads/afflib-3.6.12.tar.gz

@ -7,14 +7,14 @@ http://www.afflib.org/
 BSD-4
 Library that implements the AFF image standard
 ~amd64 ~hppa ~ppc ~x86
-autotools eutils libtool multilib portability toolchain-funcs user
+autotools autotools-utils base eutils libtool multilib portability python toolchain-funcs user
 fuse ncurses python qemu readline s3 static-libs threads



 4

-configure install prepare
+compile configure install prepare setup test unpack



--- a/metadata/cache/app-forensics/libewf-20100226-r1
+++ b/metadata/cache/app-forensics/libewf-20100226-r1
@ -1,4 +1,4 @@
-sys-libs/e2fsprogs-libs sys-libs/zlib dev-libs/openssl
+sys-libs/e2fsprogs-libs sys-libs/zlib dev-libs/openssl || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 sys-libs/e2fsprogs-libs sys-libs/zlib dev-libs/openssl
 0
 mirror://sourceforge/libewf/libewf-20100226.tar.gz
@ -7,14 +7,14 @@ http://libewf.sourceforge.net
 BSD
 Implementation of the EWF (SMART and EnCase) image format
 ~amd64 ~hppa ~ppc ~x86
-
+autotools autotools-utils base eutils libtool multilib portability toolchain-funcs user
 debug ewf2 rawio static-libs unicode



 4

-configure install
+compile configure install prepare test unpack



--- a/metadata/cache/app-misc/vifm-0.7.1
+++ b/metadata/cache/app-misc/vifm-0.7.1
@ -0,0 +1,22 @@
+>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file )
+>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) vim-plugin? ( >=app-editors/vim-7.3 ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+0
+mirror://sourceforge/vifm/vifm-0.7.1.tar.bz2
+
+http://vifm.sourceforge.net/
+GPL-2
+Console file manager with vi(m)-like keybindings
+~amd64 ~ppc ~s390 ~x86
+base eutils multilib portability toolchain-funcs user
+compatibility +extended-keys +magic vim-plugin vim-syntax
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
--- a/metadata/cache/app-mobilephone/gnome-phone-manager-0.68
+++ b/metadata/cache/app-mobilephone/gnome-phone-manager-0.68
@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-phone-manager/0.68/gnome-phone-manager-0.68.tar.xz
 http://live.gnome.org/PhoneManager
 GPL-2
 A program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop
-~amd64 ~ppc ~x86
+~amd64 ~x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
 gnome debug

--- a/metadata/cache/dev-java/icedtea-web-1.1.4
+++ b/metadata/cache/dev-java/icedtea-web-1.1.4
@ -0,0 +1,22 @@
+dev-java/icedtea:6 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:6 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+6
+http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
+
+http://icedtea.classpath.org
+GPL-2 GPL-2-with-linking-exception LGPL-2
+FOSS Java browser plugin and Web Start implementation
+~amd64 ~ppc ~ppc64 ~x86
+autotools eutils fdo-mime java-pkg-2 java-utils-2 java-vm-2 libtool multilib pax-utils portability prefix toolchain-funcs user versionator
+build doc javascript +nsplugin test elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare prerm setup
+
+
+
+
+
--- a/metadata/cache/dev-java/icedtea-web-1.1.4-r7
+++ b/metadata/cache/dev-java/icedtea-web-1.1.4-r7
@ -0,0 +1,22 @@
+dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+7
+http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
+
+http://icedtea.classpath.org
+GPL-2 GPL-2-with-linking-exception LGPL-2
+FOSS Java browser plugin and Web Start implementation
+~amd64 ~x86
+autotools eutils fdo-mime java-pkg-2 java-utils-2 java-vm-2 libtool multilib pax-utils portability prefix toolchain-funcs user versionator
+build doc javascript +nsplugin test elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare prerm setup
+
+
+
+
+
--- a/metadata/cache/dev-lang/orc-0.4.14
+++ b/metadata/cache/dev-lang/orc-0.4.14
@ -6,7 +6,7 @@ http://code.entropywave.com/download/orc/orc-0.4.14.tar.gz
 http://code.entropywave.com/projects/orc/
 BSD BSD-2
 The Oil Runtime Compiler
-~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~amd64 ~arm hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
 static-libs examples

--- a/metadata/cache/dev-lang/php-5.3.9_rc2
+++ b/metadata/cache/dev-lang/php-5.3.9_rc2
@ -0,0 +1,22 @@
+!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] adabas? ( >=dev-db/unixODBC-1.8.13 ) apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) birdstep? ( >=dev-db/unixODBC-1.8.13 ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) db2? ( >=dev-db/unixODBC-1.8.13 ) dbmaker? ( >=dev-db/unixODBC-1.8.13 ) empress? ( >=dev-db/unixODBC-1.8.13 ) empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) enchant? ( app-text/enchant ) esoob? ( >=dev-db/unixODBC-1.8.13 ) exif? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gd-external? ( media-libs/gd ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sapdb? ( >=dev-db/unixODBC-1.8.13 ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) solid? ( >=dev-db/unixODBC-1.8.13 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] adabas? ( >=dev-db/unixODBC-1.8.13 ) apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) birdstep? ( >=dev-db/unixODBC-1.8.13 ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) db2? ( >=dev-db/unixODBC-1.8.13 ) dbmaker? ( >=dev-db/unixODBC-1.8.13 ) empress? ( >=dev-db/unixODBC-1.8.13 ) empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) enchant? ( app-text/enchant ) esoob? ( >=dev-db/unixODBC-1.8.13 ) exif? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gd-external? ( media-libs/gd ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sapdb? ( >=dev-db/unixODBC-1.8.13 ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) solid? ( >=dev-db/unixODBC-1.8.13 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) apache2? ( =www-servers/apache-2* )
+5.3
+http://downloads.php.net/johannes/php-5.3.9RC2.tar.bz2 http://olemarkus.org/~olemarkus/gentoo/php-patchset-5.3.9_rc2-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.7-0.9.10.patch.gz )
+
+http://php.net/
+PHP-3
+The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib php-common-r1 phpconfutils portability toolchain-funcs user versionator
+kolab embed +cli cgi fpm apache2 threads adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt +ctype curl curlwrappers db2 dbmaker debug doc empress empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8 oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode sapdb +session sharedext sharedmem +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
+truetype? ( || ( gd gd-external ) ) cjk? ( || ( gd gd-external ) ) exif? ( || ( gd gd-external ) ) xpm? ( gd ) gd? ( zlib !gd-external ) gd-external? ( !gd ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap !oci8 ) adabas? ( odbc ) birdstep? ( odbc ) dbmaker? ( odbc ) empress-bcs? ( empress ) empress? ( odbc ) esoob? ( odbc ) db2? ( odbc ) sapdb? ( odbc ) solid? ( odbc ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) oci8? ( !oci8-instant-client !ldap-sasl ) oci8-instant-client? ( !oci8 ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) firebird? ( !interbase ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+doc? ( app-doc/php-docs )
+
+4
+
+compile configure install postinst prepare setup test
+
+
+
+
+
--- a/metadata/cache/dev-lang/php-5.4.0_rc2
+++ b/metadata/cache/dev-lang/php-5.4.0_rc2
@ -0,0 +1,22 @@
+!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+apache2? ( =www-servers/apache-2* )
+5.4
+http://downloads.php.net/stas/php-5.4.0RC2.tar.bz2 http://olemarkus.org/~olemarkus/gentoo/php-patchset-5.4.0_rc2-r0.tar.bz2
+
+http://php.net/
+PHP-3
+The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
+kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
+truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+doc? ( app-doc/php-docs )
+
+4
+
+compile configure install postinst prepare setup test
+
+
+
+
+
--- a/metadata/cache/dev-libs/redland-bindings-1.0.13.1
+++ b/metadata/cache/dev-libs/redland-bindings-1.0.13.1
@ -1,22 +0,0 @@
->=dev-libs/redland-1.0.10-r2 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) ruby? ( dev-lang/ruby dev-ruby/log4r ) >=dev-lang/swig-1.3.26 dev-util/pkgconfig sys-apps/sed >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2.7* )
->=dev-libs/redland-1.0.10-r2 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) ruby? ( dev-lang/ruby dev-ruby/log4r ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2.7* )
-0
-http://download.librdf.org/source/redland-bindings-1.0.13.1.tar.gz
-
-http://librdf.org/bindings/
-Apache-2.0 GPL-2 LGPL-2.1
-Language bindings for Redland
-~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos
-multilib python toolchain-funcs
-lua perl python php ruby
-
-
-
-3
-
-compile configure install postinst postrm setup test
-
-
-
-
-
--- a/metadata/cache/dev-libs/redland-bindings-1.0.14.1
+++ b/metadata/cache/dev-libs/redland-bindings-1.0.14.1
@ -0,0 +1,22 @@
+>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) ruby? ( dev-lang/ruby dev-ruby/log4r ) dev-util/pkgconfig >=dev-lang/swig-2 sys-apps/sed >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2.7* )
+>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) ruby? ( dev-lang/ruby dev-ruby/log4r ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2.7* )
+0
+http://download.librdf.org/source/redland-bindings-1.0.14.1.tar.gz
+
+http://librdf.org/bindings/
+Apache-2.0 GPL-2 LGPL-2.1
+Language bindings for Redland
+~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos
+multilib python toolchain-funcs
+lua perl python php ruby
+
+
+
+4
+
+compile configure install postinst postrm setup test
+
+
+
+
+
--- a/metadata/cache/dev-libs/seed-3.0.0
+++ b/metadata/cache/dev-libs/seed-3.0.0
@ -1,22 +0,0 @@
->=dev-libs/gobject-introspection-0.9 dev-libs/glib:2 virtual/libffi x11-libs/cairo x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:3 gnome-base/gnome-js-common dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/mpfr dev-libs/libxml2:2 sys-apps/dbus sys-libs/readline sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-0.9 ) profile? ( sys-devel/gcc ) >=sys-apps/sed-4
->=dev-libs/gobject-introspection-0.9 dev-libs/glib:2 virtual/libffi x11-libs/cairo x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:3 gnome-base/gnome-js-common dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/mpfr dev-libs/libxml2:2 sys-apps/dbus sys-libs/readline
-0
-mirror://gnome/sources/seed/3.0/seed-3.0.0.tar.bz2
-
-http://live.gnome.org/Seed
-LGPL-3
-Javascript bindings for Webkit-GTK and GNOME libraries
-~amd64 ~x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-debug doc profile test debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/dev-python/matplotlib-1.1.0
+++ b/metadata/cache/dev-python/matplotlib-1.1.0
@ -0,0 +1,22 @@
+dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) dev-python/pycxx dev-util/pkgconfig doc? ( app-text/dvipng dev-python/imaging dev-python/ipython dev-python/xlwt dev-python/sphinx media-gfx/graphviz[cairo] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
+dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) virtual/ttf-fonts media-fonts/stix-fonts media-fonts/texcm-ttf dev-python/pyparsing cairo? ( dev-python/pycairo ) excel? ( dev-python/xlwt ) fltk? ( dev-python/pyfltk ) qt4? ( dev-python/PyQt4[X] ) traits? ( dev-python/traits dev-python/configobj ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
+0
+mirror://sourceforge/matplotlib/matplotlib-1.1.0.tar.gz doc? ( mirror://gentoo/matplotlib-sampledata.tar.bz2 ) examples? ( mirror://gentoo/matplotlib-sampledata.tar.bz2 )
+
+http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib
+PYTHON BSD
+Pure python plotting library with matlab like syntax
+~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+distutils eutils multilib portability python toolchain-funcs user
+cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets
+
+
+
+3
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
--- a/metadata/cache/dev-util/ccache-3.1.6
+++ b/metadata/cache/dev-util/ccache-3.1.6
@ -6,7 +6,7 @@ http://samba.org/ftp/ccache/ccache-3.1.6.tar.gz
 http://ccache.samba.org/
 GPL-3
 fast compiler cache
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 multilib toolchain-funcs


--- a/metadata/cache/dev-util/cmake-2.8.6-r4
+++ b/metadata/cache/dev-util/cmake-2.8.6-r4
@ -6,7 +6,7 @@ http://www.cmake.org/files/v2.8/cmake-2.8.6.tar.gz
 http://www.cmake.org/
 CMake
 Cross platform Make
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base cmake-utils elisp-common eutils flag-o-matic multilib portability toolchain-funcs user versionator virtualx
 emacs ncurses qt4 vim-syntax test

--- a/metadata/cache/gnome-base/gnome-core-libs-3.2.1
+++ b/metadata/cache/gnome-base/gnome-core-libs-3.2.1
@ -14,7 +14,7 @@ cups python

 4

-
+pretend



--- a/metadata/cache/gnome-base/gnome-session-3.0.2
+++ b/metadata/cache/gnome-base/gnome-session-3.0.2
@ -1,22 +0,0 @@
->=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 gnome-base/librsvg:2 elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40 !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) >=sys-apps/sed-4
->=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 gnome-base/librsvg:2 elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 >=x11-themes/gnome-themes-standard-2.91.92 sys-apps/dbus[X]
-0
-mirror://gnome/sources/gnome-session/3.0/gnome-session-3.0.2.tar.bz2
-
-http://www.gnome.org/
-GPL-2 LGPL-2 FDL-1.1
-Gnome session manager
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-doc ipv6 elibc_FreeBSD debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/gnome-base/libgnomekbd-3.0.0.1
+++ b/metadata/cache/gnome-base/libgnomekbd-3.0.0.1
@ -1,22 +0,0 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[introspection?] >=x11-libs/libxklavier-5.1 introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.19 >=sys-apps/sed-4
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[introspection?] >=x11-libs/libxklavier-5.1 introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-0
-mirror://gnome/sources/libgnomekbd/3.0/libgnomekbd-3.0.0.1.tar.bz2
-
-http://www.gnome.org
-LGPL-2
-Gnome keyboard configuration library
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-+introspection test
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/gnome-base/nautilus-3.0.2
+++ b/metadata/cache/gnome-base/nautilus-3.0.2
@ -1,22 +0,0 @@
->=dev-libs/glib-2.28.0:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.0.8:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3.0.0:3 gnome-base/dconf gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) xmp? ( >=media-libs/exempi-2.1.0 ) >=dev-lang/perl-5 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40.1 sys-devel/gettext x11-proto/xproto doc? ( >=dev-util/gtk-doc-1.4 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.28.0:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.0.8:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3.0.0:3 gnome-base/dconf gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) xmp? ( >=media-libs/exempi-2.1.0 ) sendto? ( !gnome-extra/nautilus-sendto )
-0
-mirror://gnome/sources/nautilus/3.0/nautilus-3.0.2.tar.bz2
-
-http://live.gnome.org/Nautilus
-GPL-2 LGPL-2 FDL-1.1
-A file manager for the GNOME desktop
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator virtualx
-doc exif gnome +introspection sendto xmp test
-
-gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 x11-themes/gnome-icon-theme-symbolic ) >=gnome-base/gvfs-0.1.2
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
--- a/metadata/cache/gnome-extra/drwright-3.0.2
+++ b/metadata/cache/gnome-extra/drwright-3.0.2
@ -1,22 +0,0 @@
->=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.0.0:3 >=gnome-base/gnome-settings-daemon-2.91.8 >=gnome-base/gnome-control-center-2.91.6 >=x11-libs/libnotify-0.7 media-libs/libcanberra[gtk3] x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-proto/scrnsaverproto sys-devel/gettext >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.12.0 >=sys-apps/sed-4
->=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.0.0:3 >=gnome-base/gnome-settings-daemon-2.91.8 >=gnome-base/gnome-control-center-2.91.6 >=x11-libs/libnotify-0.7 media-libs/libcanberra[gtk3] x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver
-0
-mirror://gnome/sources/drwright/3.0/drwright-3.0.2.tar.bz2
-
-http://git.gnome.org/browse/drwright
-GPL-2
-A GNOME 3 tool that forces you to take regular breaks to prevent RSI
-~amd64 ~x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare unpack
-
-
-
-
-
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST teco-7.el.bz2 16372 RMD160 73ca72286844171548303979b274843a550335bc SHA1 98707cf208484e01d082c2313dde4f880a2a7eb5 SHA256 28c04c00f36bc04ffd31291fa2718538a549a5d86dc372a427fba60b40801570`