Sync with portage [Sat Jul 21 16:07:26 MSK 2012].

12 years ago · fa0afe7757
parent a9bd936d58
commit fa0afe7757
465 changed files with 7188 additions and 3044 deletions
--- a/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-api-change.patch
@ -0,0 +1,17 @@
+--- a/contrib/browser-plugin/pk-main.c
+++ b/contrib/browser-plugin/pk-main.c
+@@ -503,11 +503,11 @@ NP_Shutdown ()
+ /**
+  * NP_GetMIMEDescription:
+  **/
+-const char *
+char *
+ NP_GetMIMEDescription (void)
+ {
+ 	g_debug ("NP_GetMIMEDescription");
+-	return (const gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
+	return (gchar*) "application/x-packagekit-plugin:bsc:PackageKit Plugin";
+ }
+ 
+ /**
+
--- a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.1 2012/05/19 11:21:34 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.2 2012/07/20 17:30:53 lxnay Exp $

 EAPI="3"

@ -38,7 +38,7 @@ CDEPEND="connman? ( net-misc/connman )
 	>=sys-apps/dbus-1.3.0"
 DEPEND="${CDEPEND}
 	doc? ( dev-util/gtk-doc )
-	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
@ -65,6 +65,8 @@ RESTRICT="test" # tests are failing atm
 # doc is in the tarball and always installed
 # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
 #	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
+# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
+# drop the npapi-api-change patch below and relax the dependency constraints

 # UPSTREAM:
 # documentation/website with --enable-doc-install
@ -72,6 +74,7 @@ RESTRICT="test" # tests are failing atm

 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.6.22-npapi-sdk.patch #383141
+	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
 }

 src_configure() {
@ -120,6 +123,7 @@ src_configure() {
 		--disable-gtk-module \
 		$(use_enable introspection) \
 		$(use_enable networkmanager) \
+		$(use_enable connman) \
 		$(use_enable nsplugin browser-plugin) \
 		$(use_enable pm-utils) \
 		--disable-qt \
--- a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild,v 1.4 2012/06/27 18:54:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild,v 1.6 2012/07/20 13:36:26 lxnay Exp $

 EAPI="3"

@ -38,7 +38,7 @@ CDEPEND="connman? ( net-misc/connman )
 	>=sys-apps/dbus-1.3.0"
 DEPEND="${CDEPEND}
 	doc? ( dev-util/gtk-doc )
-	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
@ -65,6 +65,8 @@ RESTRICT="test" # tests are failing atm
 # doc is in the tarball and always installed
 # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
 #	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
+# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
+# drop the npapi-api-change patch below and relax the dependency constraints

 # UPSTREAM:
 # documentation/website with --enable-doc-install
@ -72,6 +74,7 @@ RESTRICT="test" # tests are failing atm

 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-sdk.patch #383141
+	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
 	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
 	sed -i -e '/polkit-backend-1/d' configure || die #423431
 }
@ -123,6 +126,7 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable networkmanager) \
 		$(use_enable nsplugin browser-plugin) \
+		$(use_enable connman) \
 		$(use_enable pm-utils) \
 		--disable-qt \
 		$(use_enable static-libs static) \
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild,v 1.1 2012/05/19 11:57:33 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild,v 1.2 2012/07/20 13:40:27 lxnay Exp $

 EAPI="3"

@ -28,6 +28,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"

 src_configure() {
+	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
+	sed -i -e '/polkit-backend-1/d' configure || die #423431
 	econf \
 		--localstatedir=/var \
 		--enable-introspection=yes \
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild,v 1.1 2012/05/19 11:56:18 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild,v 1.2 2012/07/20 13:40:30 lxnay Exp $

 EAPI="3"

@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"

 src_configure() {
+	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
+	sed -i -e '/polkit-backend-1/d' configure || die #423431
 	econf \
 		--enable-introspection=no \
 		--localstatedir=/var \
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -1,3 +1,4 @@
 DIST puppet-2.7.11.gem 1846272 SHA256 d58c0ad7ee05364d3431fefd2894690eed3364362d759b0b2627c44f71c955d6 SHA512 a04b09399746c22dc820393aa1ba0c62fcf52d6a9ccc81f0f60f6079eba0cec1cf97d1d848eddd19ac58e5a68f4e6fd61aff7a035ba227e69e08bbd0c0cc0ac0 WHIRLPOOL a69811a1d95406789e611c82f881069358c9d49145371286907957844bc167e72b1f736493f81beea50b88fcde0d7c1807ac32cec6736e5fecfe29aa23ef4cd8
 DIST puppet-2.7.12.gem 1876480 SHA256 2c96c6cba32b1b413faee8a0d96b1f33be08aca99d165ea689f06a7dc1a2bc1f SHA512 bb56fc099c6cb1db93b74c346077775f44807283b34cef4b61dab4511395beeaf516f034b55b379e4618331431512a4535d44717f668e2e64f402c07a6e57927 WHIRLPOOL fed5d8e56f1b962ce270e651ab1030933c1068d8c6386da05755bbd9907ec30317d6f799bd12e598606212a14c6a509605e88d5b02517ceb6fff3c76af3f87d4
 DIST puppet-2.7.13.gem 1876992 SHA256 1e91ee9eed15d2ca4aba691299d1bde61de310cbcee0f1a557f9d47ffd2e0bd8 SHA512 d780985bb143da3361b64cecef6f7ab45ce23e221d2aaa4523dae2076cc6039ddd01293359054d6dcf9c60cd7d904d7edf190a724e11fb449fc25ebd3c586859 WHIRLPOOL 351c0ade55534f4773c282f324753e475ba416c135727e2bb51f14b145fb037a03a9f885f78be2792e316046c997ee0e4e2f507172079791d868b699e0c52ec5
+DIST puppet-2.7.18.gem 1920000 SHA256 147cd18ec39d2768bbc40f2735a84f770d9dde1b5679ba21f37edd6f7db19089 SHA512 e51c09baf2eee908f3b4ad1d90c252eb0eca3a1eb550522d0b612db919de305b724a13fdcc7abac51da31291b4a703b2478d2fc9ebfc5aa995ad677aabc42c83 WHIRLPOOL 9f2f4d30acfddd78f0d57ab0a58f400d6c1218e6f5e6541a5f224b9243f5ef5c2dee64bde5a69dff16df42242fa3f44ee226b4aa411a249fc8acafdd1ae17bf3
--- a/app-admin/puppet/puppet-2.7.18.ebuild
+++ b/app-admin/puppet/puppet-2.7.18.ebuild
@ -0,0 +1,178 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.18.ebuild,v 1.1 2012/07/20 16:52:10 matsuu Exp $
+
+EAPI="4"
+# ruby19: dev-ruby/ruby-ldap has no ruby19
+#USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.6
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3-ruby )
+	virtual/ruby-ssl"
+#	couchdb? ( dev-ruby/couchrest )
+#	mongrel? ( www-servers/mongrel )
+#	rack? ( >=dev-ruby/rack-1 )
+#	rails? (
+#		dev-ruby/rails
+#		>=dev-ruby/activerecord-2.1
+#	)
+#	stomp? ( dev-ruby/stomp )
+
+DEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	selinux? ( sec-policy/selinux-puppet )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppet.init puppet
+	doconfd conf/gentoo/conf.d/puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+	# Bug #338439
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
+
+	# Location of log and data files
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster-2.7.6.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+	docinto conf; dodoc conf/namespaceauth.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
--- a/app-editors/editra/Manifest
+++ b/app-editors/editra/Manifest
@ -1,2 +1,2 @@
-DIST Editra-0.6.89.tar.gz 3945444 SHA256 f19171cefa79a1d98ce2359e4fd6f8834a545cef7f3df377ab3efa842e5dc182 SHA512 ad4b78c1823c27eb205620c66e2bf33388f8a255d561048819166b89adda9770e7b509b331f83f752d46973e7c00996a0fd82606dc0e34de80039b0c2f25b24a WHIRLPOOL 7ff83d6aa16e54b8fbbfb2b08c33ec6e8b634d8b9c6067d7101398018097d09fd5616d33805293114ff87e55e9711ccd516ef3ed195bfb925eed79b7124c9ad4
 DIST Editra-0.7.01.tar.gz 4045754 SHA256 8f3442b3468b92c4478c171492569672d1b00961bfc2c4f35c125c8293e6c8e9 SHA512 1ded25935abc8e18a26d5d00aa0ee1fb4f35db464a3e7a0deb7915c4a2f3482be25c1b7f258708210e6a28130523fad9bef1b220359696e8ea2adf908284516c WHIRLPOOL dbb93fad87690d41fffe4b9c9ddaf65f36cdb5bf4e9d0da6813cf2e4ff0266bb4fc83b16e7df6dfe17bb5b38bed5d5469339f19945c1c05ee85c0ab2c5171188
+DIST Editra-0.7.08.tar.gz 4066555 SHA256 d5ed31ab6dcb014c19584ce96d931f5e6aa9a78fdbac36e63132b15929559f63 SHA512 ecacdb021aa86e68bbb51b18b34dc1113246008f7f216f660e6fd75aa98f6ee25d747822a09a1fdb88639dda05293532de546475c4a3e1070a5e1368d5999978 WHIRLPOOL 4432da9b97b014695efcce295cbc56017f4e2421bca0c046850f9b276b423ac4ea1e3de909df2ad5e28b3f144b7141ec1a17f39ce811ddf214b8769969c3df20
--- a/app-editors/editra/editra-0.7.08.ebuild
+++ b/app-editors/editra/editra-0.7.08.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.6.89.ebuild,v 1.3 2012/02/28 11:51:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.7.08.ebuild,v 1.1 2012/07/21 02:30:57 dirtyepic Exp $

 EAPI=2
 SUPPORT_PYTHON_ABIS=1
--- a/app-editors/mp/files/mp-5.2.2-gtk+.patch
+++ b/app-editors/mp/files/mp-5.2.2-gtk+.patch
@ -0,0 +1,40 @@
+ mpv_gtk.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mpv_gtk.c b/mpv_gtk.c
+index 3abba24..ea99144 100644
+--- a/mpv_gtk.c
+++ b/mpv_gtk.c
+@@ -2499,12 +2499,12 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+ #endif
+     gtk_notebook_set_scrollable(GTK_NOTEBOOK(file_tabs), 1);
+ 
+-    vbox = gtk_vbox_new(FALSE, 2);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+     gtk_container_add(GTK_CONTAINER(window), vbox);
+ 
+     build_menu();
+ 
+-    hbox = gtk_hbox_new(FALSE, 0);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+     gtk_box_pack_start(GTK_BOX(hbox), menu_bar, FALSE, FALSE, 0);
+     gtk_box_pack_start(GTK_BOX(hbox), file_tabs, TRUE, TRUE, 0);
+@@ -2512,7 +2512,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+     gtk_notebook_popup_enable(GTK_NOTEBOOK(file_tabs));
+ 
+     /* horizontal box holding the text and the scrollbar */
+-    hbox = gtk_hbox_new(FALSE, 2);
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+ 
+     /* the Minimum Profit area */
+@@ -2578,7 +2578,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+                      G_CALLBACK(switch_page), NULL);
+ 
+     /* the scrollbar */
+-    scrollbar = gtk_vscrollbar_new(NULL);
+    scrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
+     gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0);
+ 
+     g_signal_connect(G_OBJECT
--- a/app-editors/mp/mp-5.2.1.ebuild
+++ b/app-editors/mp/mp-5.2.1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.7 2012/07/08 15:03:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.8 2012/07/20 08:24:58 jlec Exp $

-EAPI="3"
+EAPI=4

 inherit eutils toolchain-funcs

@ -65,16 +65,5 @@ src_configure() {
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
-	emake -j1 DESTDIR="${D}" install || die "Install Failed"
-#	use gtk && dosym mp-5 /usr/bin/gmp
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		einfo
-		einfo "mp-5 is symlinked to gmp! Use"
-		einfo "$ DISPLAY=\"\" mp-5"
-		einfo "to use text mode!"
-		einfo
-	fi
+	emake DESTDIR="${D}" install
 }
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.2.ebuild
@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.2 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.3 2012/07/20 08:24:58 jlec Exp $

 EAPI=4
+
 inherit eutils toolchain-funcs

 DESCRIPTION="Minimum Profit: A text editor for programmers"
@ -44,13 +45,20 @@ DEPEND="
 "

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.2.1-prll.patch
+	epatch \
+		"${FILESDIR}"/${P}-gtk+.patch \
+		"${FILESDIR}"/${PN}-5.2.1-prll.patch
 	local mp_lingua
 	for mp_lingua in ${MP_LINGUAS}; do
 		if ! use linguas_${mp_lingua}; then
 			rm po/${mp_lingua/linguas_/}.[mp]o || die
 		fi
 	done
+	[[ $(ls po 2> /dev/null) ]] || \
+		sed \
+			-e '/^all/s:$(BUILDMO)::g' \
+			-e '/^install/s:$(INSTALLMO)::g' \
+			-i makefile.in || die
 }

 src_configure() {
@ -86,16 +94,5 @@ src_configure() {
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
-	emake -j1 DESTDIR="${D}" install
-#	use gtk && dosym mp-5 /usr/bin/gmp
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		einfo
-		einfo "mp-5 is symlinked to gmp! Use"
-		einfo "$ DISPLAY=\"\" mp-5"
-		einfo "to use text mode!"
-		einfo
-	fi
+	emake DESTDIR="${D}" install
 }
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@ -1 +1,2 @@
 DIST emacs-daemon-0.18.tar.bz2 5074 SHA256 6c5f32e71e220fe0bac089af1fda75b1412ff4902e08740d093bc79b7a75450c SHA512 d34b5c276760128f877ee8d50b45f4a37077a19d80611512e47911ba37c4f62d81042fc26f8e824a2ca2b42a0b171d03bcfdc35550f07298a64aaadd0569086a WHIRLPOOL f04836958a044f2af35d926d4c628120b0b674bfe87e47d171eb310fcdf500313ac1e86a41ebcd33c33ea911a0883a55258731972c78ab575ba6736780bbae8e
+DIST emacs-daemon-0.19.tar.bz2 4988 SHA256 63231c4c0d04310eeeb432d33d195b620b5b8308aecfdb93825df0c4acc4a341 SHA512 f1684387f3018f1dcb2d9d600a4155ce7980264e817aff762a49b04ac0b01fe6ab68bb702694a9eba28770c4eaadbc1a02ef570270eb5b8369c789c7fc60370a WHIRLPOOL ec18ebae334e1da36aa79a0542cb3563962e5542fdaba72f667adc9831406ad8ac99dddf5ec649127eaff8d67890d3c8f6acdd32a79f33c27e8554157674ef59
--- a/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.1 2012/07/21 09:40:10 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Gentoo support for Emacs running as a server in the background"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/emacs-23"
+RDEPEND="${DEPEND}"
+
+SITEFILE="10${PN}-gentoo.el"
+
+pkg_setup() {
+	local has_daemon has_gtk line
+	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
+	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
+
+	if [[ ${has_daemon} != t ]]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Your current Emacs version does not support running as a daemon
+		which is required for ${CATEGORY}/${PN}.
+		Use "eselect emacs" to select an Emacs version >= 23.
+		EOF
+	elif [[ ${has_gtk} == t ]]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Your current Emacs is compiled with GTK+. There is a long-standing
+		bug in GTK+ that prevents Emacs from recovering from X disconnects:
+		<http://bugzilla.gnome.org/show_bug.cgi?id=85715>
+		If you run Emacs as a daemon, then it is strongly recommended that
+		you compile it with the Lucid toolkit, i.e. with USE="Xaw3d -gtk".
+		EOF
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	newinitd emacs.rc emacs || die
+	newconfd emacs.conf emacs || die
+	exeinto /usr/libexec/emacs
+	doexe emacs-wrapper.sh emacs-stop.sh || die
+	elisp-site-file-install "${SITEFILE}" || die
+	dodoc README ChangeLog || die
+}
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@ -1,2 +1,2 @@
-DIST lxc-0.8.0-rc1-backports-1.tar.xz 4340 SHA256 201520be455f631a2ffcc21cfeb0bf50005feed48e3533b228ebd93170a912a7 SHA512 dc8f64a2314f774e7e44b184915dd4de45216bdd416d49792163a5ddd5eef6ab1f0156f3cc5e4338e4e6040cf4e67b51c125c541c0cb69afd4b9458482497c44 WHIRLPOOL 411ea6d08a2f9907f5bb8014bb3de47f1b2e5f06e0924ea289412b202ba4c2138e6d1bfb98117b2575b547bcf9b6bb93378bccb498a5be5f2db3bd47301816dc
-DIST lxc-0.8.0-rc1.tar.gz 301029 SHA256 32bf83902c07387646c55de440d6d12cf61bd54c97417109c2d1ac47d17cb911 SHA512 27c783616b8d14e8fa771b6ee7c94bf832321135235c2d3a988dbbc8111184489d20f0234e3dd150d5d89b2c3b4430171d5479802aeba516ffbe5ea821b8f2ac WHIRLPOOL ecb354e88838ad86d06467848330eb5a31031004d2115bceda425a0e5f195582fb05968d9c6bd5dc5e8edf3003b5ab44e06a23f79b186f81dcc89b4bd3f8de62
+DIST lxc-0.8.0-rc2-backports-1.tar.xz 4312 SHA256 3bface361045819cb99827fef3dcb4662282567ed2a1eb9aaa0befa613a6461c SHA512 45943f763e218925e78f05a86cd26e5d7aaf749bea5ce7b457d4592fc4fc2b17723afa923892716cbb60f0ce1fc20ecced452af2128b3bfa1d072d3d31af1e07 WHIRLPOOL 833554e53a69a903a2b948c202e9d60714f504abe27751d6feda274a248184c06b3108916d3f80018fb3bf3584faa9cec51054751a661c269b44a46ef58a71ba
+DIST lxc-0.8.0-rc2.tar.gz 302999 SHA256 1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef SHA512 e6608f980489f67d412c9a50f8c3f65c1afbba520dfdfe2b695c597c2706544291f31c8cfca2d86cfbab09029f8a5706fae5ab72f1c45dccca5f7e2ae8851181 WHIRLPOOL b41fe7e14315b9e6702070535edfee68379c01fba23d143c5f11afa20f6d392c8bc32953da46ec3f74d7a2affe9f828d918f23a8a16c430e3b8ffcc9b2c10057
--- a/app-emulation/lxc/files/lxc.initd.2
+++ b/app-emulation/lxc/files/lxc.initd.2
@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.4 2012/06/07 12:59:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.5 2012/07/21 05:07:15 flameeyes Exp $

 CONTAINER=${SVCNAME#*.}

@ -104,7 +104,7 @@ stop() {
 	    return 0
 	fi

-	init_pid=$(lxc-info -n ${CONTAINER} --pid | cut -d: -f 2)
+	init_pid=$(lxc-info -n ${CONTAINER} --pid | awk '{ print $2 }')

 	if [ "${init_pid}" = "-1" ]; then
 	    ewarn "${CONTAINER} doesn't seem to be running."
@ -112,7 +112,7 @@ stop() {
 	fi

 	ebegin "Shutting down system in ${CONTAINER}"
-	kill -INT ${init_pid}
+	kill -PWR ${init_pid}
 	eend $?

 	TIMEOUT=${TIMEOUT:-30}
--- a/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild
+++ b/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild,v 1.1 2012/06/07 12:59:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc2.ebuild,v 1.1 2012/07/21 05:07:14 flameeyes Exp $

 EAPI="4"

@ -39,6 +39,7 @@ RDEPEND="${RDEPEND}
 		sys-apps/util-linux
 		app-misc/pax-utils
 		>=sys-apps/openrc-0.9.9.1
+		virtual/awk
 	)"

 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
@ -88,7 +89,7 @@ DOCS=(AUTHORS CONTRIBUTING MAINTAINERS TODO README doc/FAQ.txt)

 src_prepare() {
 	if [[ -n ${BACKPORTS} ]]; then
-		epatch "${S}"/patches/*
+		epatch "${WORKDIR}"/patches/*
 		eautoreconf
 	fi
 }
--- a/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
+++ b/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
@ -0,0 +1,29 @@
+--- a/src/sphinxexpr.cpp
+++ b/src/sphinxexpr.cpp
+@@ -1796,7 +1796,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
+ 			if ( val<this->m_dValues[i] )
+ 				return i;
+@@ -1827,7 +1827,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, m_dTurnPoints )
+ 			if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
+ 				return i;
+@@ -1873,7 +1873,7 @@ public:
+ 	/// evaluate arg, check if the value is within set
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		return this->m_dValues.BinarySearch ( val )!=NULL;
+ 	}
+ 
--- a/app-misc/sphinx/sphinx-2.0.4-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.4-r1.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.4-r1.ebuild,v 1.1 2012/07/21 08:00:54 graaff Exp $
+
+EAPI=4
+inherit eutils autotools
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+# This has been added by Gentoo, to explicitly version libstemmer.
+# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
+# fetched.
+STEMMER_PV="20091122"
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
+	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug id64 mysql odbc postgres stemmer test"
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	odbc? ( dev-db/unixODBC )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/php )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if use stemmer; then
+		cd "${S}"
+		unpack libstemmer_c-${STEMMER_PV}.tgz
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch \
+		"${FILESDIR}"/${P}_gcc-4.7.patch
+
+	# drop nasty hardcoded search path breaking Prefix
+	sed -i -e '/\/usr\/local\//d' configure.ac || die
+
+	# Regenerate autoconf files in the api directory first to avoid
+	# running elibtoolize twice, which results in a warning.
+	pushd api/libsphinxclient || die
+	eautoreconf
+	popd || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# fix libiconv detection
+	use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+	econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with postgres pgsql) \
+		$(use_with stemmer libstemmer)
+
+	cd api/libsphinxclient || die
+	econf STRIP=:
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+	elog "Tests require access to a live MySQL database and may require configuration."
+	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+	dodoc doc/*
+
+	dodir /var/lib/sphinx
+	dodir /var/log/sphinx
+	dodir /var/run/sphinx
+
+	newinitd "${FILESDIR}"/searchd.rc searchd
+
+	if use test; then
+		insinto /usr/share/${PN}
+		doins -r test
+	fi
+}
--- a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
+++ b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
@ -0,0 +1,37 @@
+From c0f298d3db5202d1e6de7e093923f396116eefc6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Jul 2012 10:46:33 -0400
+Subject: [PATCH] FTS parser: ICU cannot handle locale descriptions of > 157
+ characters
+
+ICU's unicode/uloc.h #defines ULOC_FULLNAME_CAPACITY as 157. If a locale
+description cannot fit in a buffer of size ULOC_FULLNAME_CAPACITY,
+ubrk_open(UBRK_WORD, locale, ...) will fail when attempring to
+canonicalize the locale string.
+
+To avoid this, we must not pass setlocale(LC_ALL, NULL) to ICU since that
+can easily be >200 chars for common locales. Instead, limit ourselves to
+LC_CTYPE, since after all, that's all we need to determine word
+boundaries.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675660
+---
+ src/libtracker-fts/tracker-parser-libicu.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
+index 7388f69..69f75ed 100644
+--- a/src/libtracker-fts/tracker-parser-libicu.c
+++ b/src/libtracker-fts/tracker-parser-libicu.c
+@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
+ 
+ 		/* Open word-break iterator */
+ 		parser->bi = ubrk_open(UBRK_WORD,
+-		                       setlocale (LC_ALL, NULL),
+		                       setlocale (LC_CTYPE, NULL),
+ 		                       parser->utxt,
+ 		                       parser->utxt_size,
+ 		                       &error);
+-- 
+1.7.8.6
+
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 linux-info multilib python versionator
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://projects.gnome.org/tracker/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE="doc" is managed by eclass.
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+
+# Test suite highly disfunctional, loops forever
+# putting aside for now
+RESTRICT="test"
+
+# vala is built with debug by default (see VALAFLAGS)
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-0.9.5
+	>=dev-libs/icu-4
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2
+	>=x11-libs/pango-1
+	sys-apps/util-linux
+
+	applet? (
+		>=gnome-base/gnome-panel-2.91.6
+		>=x11-libs/gdk-pixbuf-2.12:2
+		>=x11-libs/gtk+-3.0:3 )
+	eds? (
+		>=mail-client/evolution-2.91.90
+		>=gnome-extra/evolution-data-server-2.91.90 )
+	elibc_glibc? ( >=sys-libs/glibc-2.12 )
+	exif? ( >=media-libs/libexif-0.6 )
+	firefox-bookmarks? ( || (
+		>=www-client/firefox-4.0
+		>=www-client/firefox-bin-4.0 ) )
+	flac? ( >=media-libs/flac-1.2.1 )
+	flickr? ( net-libs/rest:0.7 )
+	gif? ( media-libs/giflib )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
+	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.31:0.10
+		upnp? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
+	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	gtk? (
+		>=dev-libs/libgee-0.3:0
+		>=x11-libs/gtk+-3.0.0:3 )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	laptop? ( >=sys-power/upower-0.9 )
+	mp3? (
+		>=media-libs/taglib-1.6
+		gtk? ( x11-libs/gdk-pixbuf:2 ) )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=x11-libs/cairo-1
+		>=app-text/poppler-0.16[cairo,utils]
+		>=x11-libs/gtk+-2.12:2 )
+	playlist? ( dev-libs/totem-pl-parser )
+	rss? ( net-libs/libgrss )
+	thunderbird? ( || (
+		>=mail-client/thunderbird-5.0
+		>=mail-client/thunderbird-bin-5.0 ) )
+	tiff? ( media-libs/tiff )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xine? ( >=media-libs/xine-lib-1 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )"
+#	strigi? ( >=app-misc/strigi-0.7 )
+#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	applet? ( >=dev-lang/vala-0.12:0.12 )
+	gtk? (
+		>=dev-lang/vala-0.12:0.12
+		>=dev-libs/libgee-0.3 )
+	doc? (
+		app-office/dia
+		>=dev-util/gtk-doc-1.8
+		media-gfx/graphviz )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+#	strigi? ( >=dev-lang/vala-0.12:0.12 )
+PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	inotify_enabled
+
+	if use gstreamer ; then
+		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
+		if use upnp; then
+			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
+		else
+			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
+		fi
+	elif use xine ; then
+		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
+	else
+		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
+	fi
+
+	# if use applet || use gtk || use strigi; then
+	if use applet || use gtk; then
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
+	fi
+
+	# if use mp3 && (use gtk || use qt4); then
+	if use mp3 && use gtk; then
+		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+		G2CONF="${G2CONF} --enable-gdkpixbuf"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	# According to NEWS, introspection is required
+	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
+	# is not being generated
+	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
+	# nautilus extension is in a separate package, nautilus-tracker-tags
+	G2CONF="${G2CONF}
+		--disable-hal
+		--disable-libcue
+		--enable-tracker-fts
+		--with-enca
+		--with-unicode-support=libicu
+		--enable-guarantee-metadata
+		--enable-introspection
+		--disable-libstreamanalyzer
+		--disable-qt
+		--disable-nautilus-extension
+		$(use_enable applet tracker-search-bar)
+		$(use_enable eds miner-evolution)
+		$(use_enable exif libexif)
+		$(use_enable firefox-bookmarks miner-firefox)
+		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
+		FIREFOX=${S}/firefox-version.sh
+		$(use_enable flac libflac)
+		$(use_enable flickr miner-flickr)
+		$(use_enable gnome-keyring)
+		$(use_enable gsf libgsf)
+		$(use_enable gtk tracker-explorer)
+		$(use_enable gtk tracker-preferences)
+		$(use_enable gtk tracker-needle)
+		$(use_enable iptc libiptcdata)
+		$(use_enable jpeg libjpeg)
+		$(use_enable laptop upower)
+		$(use_enable mp3 taglib)
+		$(use_enable networkmanager network-manager)
+		$(use_enable pdf poppler)
+		$(use_enable playlist)
+		$(use_enable rss miner-rss)
+		$(use_enable test functional-tests)
+		$(use_enable test unit-tests)
+		$(use_enable thunderbird miner-thunderbird)
+		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
+		THUNDERBIRD=${S}/thunderbird-version.sh
+		$(use_enable tiff libtiff)
+		$(use_enable vorbis libvorbis)
+		$(use_enable xml libxml2)
+		$(use_enable xmp exempi)"
+	#	$(use_enable strigi libstreamanalyzer)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix build failures with USE=strigi
+	epatch "${FILESDIR}/${PN}-0.12.3-strigi.patch"
+
+	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
+	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
+
+	# Fix functional tests scripts
+	find "${S}" -name "*.pyc" -delete
+	python_convert_shebangs -r 2 tests utils examples
+
+	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
+	# access violations on some setups (bug #385347, #385495).
+	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+	# FIXME: report broken tests
+	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-miner/tracker-password-provider-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Manually symlink extensions for {firefox,thunderbird}-bin
+	if use firefox-bookmarks; then
+		dosym /usr/share/xul-ext/trackerfox \
+			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+	fi
+}
+
+create_version_script() {
+	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+	local v=$(best_version ${1})
+	v=${v#${1}-}
+	local vbin=$(best_version ${1}-bin)
+	vbin=${vbin#${1}-bin-}
+
+	if [[ -z ${v} ]]; then
+		v=${vbin}
+	else
+		version_compare ${v} ${vbin}
+		[[ $? -eq 1 ]] && v=${vbin}
+	fi
+
+	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+	chmod +x "$3" || die
+}
--- a/app-misc/tracker/tracker-0.14.2-r1.ebuild
+++ b/app-misc/tracker/tracker-0.14.2-r1.ebuild
@ -0,0 +1,267 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 linux-info multilib python versionator
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://projects.gnome.org/tracker/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE="doc" is managed by eclass.
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+REQUIRED_USE="cue? ( gstreamer )"
+
+# Test suite highly disfunctional, loops forever
+# putting aside for now
+RESTRICT="test"
+
+# vala is built with debug by default (see VALAFLAGS)
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-0.9.5
+	>=dev-libs/icu-4
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2
+	>=x11-libs/pango-1
+	sys-apps/util-linux
+
+	applet? (
+		>=gnome-base/gnome-panel-2.91.6
+		>=x11-libs/gdk-pixbuf-2.12:2
+		>=x11-libs/gtk+-3.0:3 )
+	cue? ( media-libs/libcue )
+	eds? (
+		>=mail-client/evolution-3.3.5
+		>=gnome-extra/evolution-data-server-3.3.5 )
+	elibc_glibc? ( >=sys-libs/glibc-2.12 )
+	exif? ( >=media-libs/libexif-0.6 )
+	firefox-bookmarks? ( || (
+		>=www-client/firefox-4.0
+		>=www-client/firefox-bin-4.0 ) )
+	flac? ( >=media-libs/flac-1.2.1 )
+	flickr? ( net-libs/rest:0.7 )
+	gif? ( media-libs/giflib )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
+	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.31:0.10
+		upnp? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
+	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	gtk? (
+		>=dev-libs/libgee-0.3:0
+		>=x11-libs/gtk+-3.0.0:3 )
+	iptc? ( media-libs/libiptcdata )
+	iso? ( >=sys-libs/libosinfo-0.0.2 )
+	jpeg? ( virtual/jpeg:0 )
+	laptop? ( >=sys-power/upower-0.9 )
+	mp3? (
+		>=media-libs/taglib-1.6
+		gtk? ( x11-libs/gdk-pixbuf:2 ) )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=x11-libs/cairo-1
+		>=app-text/poppler-0.16[cairo,utils]
+		>=x11-libs/gtk+-2.12:2 )
+	playlist? ( dev-libs/totem-pl-parser )
+	rss? ( net-libs/libgrss )
+	thunderbird? ( || (
+		>=mail-client/thunderbird-5.0
+		>=mail-client/thunderbird-bin-5.0 ) )
+	tiff? ( media-libs/tiff )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xine? ( >=media-libs/xine-lib-1 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )"
+#	strigi? ( >=app-misc/strigi-0.7 )
+#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	applet? ( >=dev-lang/vala-0.13.4:0.14 )
+	gtk? (
+		>=dev-lang/vala-0.13.4:0.14
+		>=dev-libs/libgee-0.3 )
+	doc? (
+		app-office/dia
+		>=dev-util/gtk-doc-1.8
+		media-gfx/graphviz )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+#	strigi? ( >=dev-lang/vala-0.13.4:0.14 )
+PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	inotify_enabled
+
+	if use gstreamer ; then
+		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
+		if use upnp; then
+			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
+		else
+			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
+		fi
+	elif use xine ; then
+		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
+	else
+		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
+	fi
+
+	# if use applet || use gtk || use strigi; then
+	if use applet || use gtk; then
+		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
+	fi
+
+	# if use mp3 && (use gtk || use qt4); then
+	if use mp3 && use gtk; then
+		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+		G2CONF="${G2CONF} --enable-gdkpixbuf"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	# According to NEWS, introspection is required
+	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
+	# is not being generated
+	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
+	# nautilus extension is in a separate package, nautilus-tracker-tags
+	G2CONF="${G2CONF}
+		--disable-hal
+		--enable-tracker-fts
+		--with-enca
+		--with-unicode-support=libicu
+		--enable-guarantee-metadata
+		--enable-introspection
+		--disable-libstreamanalyzer
+		--disable-qt
+		--disable-nautilus-extension
+		$(use_enable applet tracker-search-bar)
+		$(use_enable cue libcue)
+		$(use_enable eds miner-evolution)
+		$(use_enable exif libexif)
+		$(use_enable firefox-bookmarks miner-firefox)
+		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
+		FIREFOX=${S}/firefox-version.sh
+		$(use_enable flac libflac)
+		$(use_enable flickr miner-flickr)
+		$(use_enable gnome-keyring)
+		$(use_enable gsf libgsf)
+		$(use_enable gtk tracker-explorer)
+		$(use_enable gtk tracker-preferences)
+		$(use_enable gtk tracker-needle)
+		$(use_enable iptc libiptcdata)
+		$(use_enable iso libosinfo)
+		$(use_enable jpeg libjpeg)
+		$(use_enable laptop upower)
+		$(use_enable mp3 taglib)
+		$(use_enable networkmanager network-manager)
+		$(use_enable pdf poppler)
+		$(use_enable playlist)
+		$(use_enable rss miner-rss)
+		$(use_enable test functional-tests)
+		$(use_enable test unit-tests)
+		$(use_enable thunderbird miner-thunderbird)
+		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
+		THUNDERBIRD=${S}/thunderbird-version.sh
+		$(use_enable tiff libtiff)
+		$(use_enable vorbis libvorbis)
+		$(use_enable xml libxml2)
+		$(use_enable xmp exempi)"
+	#	$(use_enable strigi libstreamanalyzer)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
+	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
+
+	# Fix functional tests scripts
+	find "${S}" -name "*.pyc" -delete
+	python_convert_shebangs -r 2 tests utils examples
+
+	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
+	# access violations on some setups (bug #385347, #385495).
+	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+	# FIXME: report broken tests
+	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-miner/tracker-password-provider-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Manually symlink extensions for {firefox,thunderbird}-bin
+	if use firefox-bookmarks; then
+		dosym /usr/share/xul-ext/trackerfox \
+			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+	fi
+}
+
+create_version_script() {
+	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+	local v=$(best_version ${1})
+	v=${v#${1}-}
+	local vbin=$(best_version ${1}-bin)
+	vbin=${vbin#${1}-bin-}
+
+	if [[ -z ${v} ]]; then
+		v=${vbin}
+	else
+		version_compare ${v} ${vbin}
+		[[ $? -eq 1 ]] && v=${vbin}
+	fi
+
+	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+	chmod +x "$3" || die
+}
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@ -1,77 +1,104 @@
 DIST calligra-l10n-ca-2.4.2.tar.bz2 439286 SHA256 58383b9bdb26f93979ff9a1979d4f3eaa471e3f88fdffd3c80428e4ecdd83ff2 SHA512 c25ac1bb6a702844ded7b0e39412e6bafbc42eb81bcc8de3990ccfaafccbaf5918c9bddf94ace4a1afd1cd5e66c6cf70b2f50195ec107775089311809585f5e3 WHIRLPOOL 4b3511d56a81271ff53c63cd272be0b473dec5482ffd033aa035d0af41b80a68bf2b59e3ce160f932bda8b9f003232da789221ff9b5710336bb0237bfd943bf3
 DIST calligra-l10n-ca-2.4.3.tar.bz2 439602 SHA256 f3c7a9c1ff4f30bd811131a36b67eff58ccd5dedad5a5541eb2b4905570ecc47 SHA512 1072d69b11cc5d61bade0b8960f5c9a22bae925a3cbd211f8d1408e1738a6f5f949b37666e7cf2e3eac1fb7bdbd8415a3f03e276e8fe7f139491a3da849325ab WHIRLPOOL 451f3a7090dcc87dd538b01224bed6b67e8d63d6b27216ddcb1d4b0561e3beeef251e79fff15879f0c356b1d4ea9445e71934f7a27251effea8cc5ba8f6ad40d
 DIST calligra-l10n-ca-2.4.90.tar.bz2 433807 SHA256 ff11bac7db1b0f93115d24a7fb8de72a1d5aff2099e8430d5c053b618b2cf7f7 SHA512 823783fcc567e1ea82905e099c1c7bca3541469e7e0526f1088ee701c1c604a013ec816b3c282b69783e0647fb872a3ffc25947aa21ddabdd7a751b5b8fc7076 WHIRLPOOL c63b2d5f546524078d1adea2a2bc13d719d13740502997db52b0a1d0bd9d45068d7de42fc4aed52e1d6b31fc81f7b7dd27837c040115b143a3d7072fa882d0a2
+DIST calligra-l10n-ca-2.4.92.tar.bz2 437224 SHA256 43927d1d988fa249527b7baf6ce8d598eca7b3f16d9731a3283ad5a7672a407f SHA512 e763069c3a8eeb55ae5bdbe7b0a03ece999f9a4b2c81e5178e7f94b44c5ee25dcd783e633294ba82ff7f12c269013f805bcb3542d669c76fe62b061c33f9cdc3 WHIRLPOOL cc2d8a4b177de2a0fea39e9445827dc0b964216434eaa540c37b83b5cd402bd0d4950af57411fb82220144e39809373b8b9c7685e9cacf725914a0e1c8ce841c
 DIST calligra-l10n-ca@valencia-2.4.2.tar.bz2 272019 SHA256 493973c7c4c00c347cdd646dcd5196133943039acc56a22e1cf3d74c6677bf88 SHA512 3d09d10609fa17cfcd0a50c2aa2926a9e636586c6946925cd584a0ebdbd42f436ae5dc77e89a709a74fc1039a010641fe7cdc8e6cee4417aba7d35a06acf436f WHIRLPOOL 48e413caebbb4321e01ceff5e5c00b155b01ce9cc94969878c0e0a491f2da286c6a4bdf453dfc3bfc290e8995c8fb113b134cee7f43138382c2bc1c576c9c9ae
 DIST calligra-l10n-ca@valencia-2.4.3.tar.bz2 271847 SHA256 0b6dc7b2596601bf902b20fac285e0c31f13ad2f5b8dd2e591d14ddde706f42b SHA512 edb3e087c00fc40e037a45c4d6e8c1f93ba4e3b1389af05595b794ba1e5b60d117ee1a2dab2f09a7d798fccd744f10e914d486936eeb485f60cf888f909140e7 WHIRLPOOL 35b2cc996719de65416e6e5f67a961bd6374178d5a427a9b6ed5872d7f6d5b241126522d69e3065d6ae23c54779031df7359ffe1983a5044641a73c728bdac1c
 DIST calligra-l10n-ca@valencia-2.4.90.tar.bz2 372594 SHA256 9af3ccb859181d1ddddeb6c6ec22c3755b89573200becd03f8e8a0518c4c7210 SHA512 492e4ef8964eff2a8505b3ba188e534ca417175f0e30f618cf8ae9a2f59c8d9eb80ece4b126f042711885a9257f3c660826809f8e788a5d87f91e520e1d5e2d7 WHIRLPOOL 6fd6d5198894b0f5c1b161b0d2ee430a8545565d8e0d430c80701b11729086b7c079596f75529fde27bb7f356eb2d0571783b8aacd1c6aeff6ccfb21d6bff4c2
+DIST calligra-l10n-ca@valencia-2.4.92.tar.bz2 375417 SHA256 f8fb7e68b01d84d16547dcba31f1760b9f825e22ced296a1b52e25991a2a19c7 SHA512 e505bc11bf24bf48f06c1b62c88517da1a41852d6dac5d2dba1768e6a7ad8dbf25211d239ae5d900425e8cec72aa27badd9b7d08c920ed30fd883c9ee49f2ce9 WHIRLPOOL 1d53ac15d8e713b55d13931cf1e36e3696eb88dad7e97a691570da6860489fe4d7d2b97e8715fa457791d3eefffe3824d8c215859b3f2d24a2aad9a31c136bd2
 DIST calligra-l10n-cs-2.4.2.tar.bz2 348260 SHA256 f16fe04dca8c1436b548f633f70822f06c8831fa74ae1037c6c39cc9a6a879bf SHA512 1a4716c86d5a3766a511cc5a5193d202033b5af0263a8a5ebf7aa5b97cdc47f0890df4fb8e7d60689f5d7e6f54fc438b16d6940f06203ca812c54d03a2048065 WHIRLPOOL efae8ad2808395b319099d596017bbed1c732cf0c1c6692db4635792c8d6778e68f01a62c8e180080d55b7b7370e39019b633859903f4749cd04a9dc0db8263b
 DIST calligra-l10n-cs-2.4.3.tar.bz2 348554 SHA256 72f20e8e00bdeb8bea77cc521bb6145213c9ef836bb5cea31c5677bb6d8d30bc SHA512 caeb211b7b3fefafc3346fc6703db640f6955359d9fac3f150d8fdb9307fb3568e278efb2ca387cdff5c4f3e52bafb043ba7c96af12c9ee18893d59ea7ab5fc5 WHIRLPOOL 942872d561d855fb581680a37abb7c7d1118b3e8df440e77b2cc0cf7243bb6528ef8b47d0d2fb1429bc5e0d6e358e2c323fb9850d881c29685131fd36ba58f52
 DIST calligra-l10n-da-2.4.2.tar.bz2 547357 SHA256 3bd32f32c369a702b517065242a7eacf16c6de17d669c9da43c7a3e53a75c6c4 SHA512 84221fae57bdba3aa6136790c3e64d33eb58a9e15a9c3012a0681ba37c621ae8cb8506ce394e116d149ec8fccb3ec38cabde2aa3721e4f7b8672f20b3919aee2 WHIRLPOOL f4a18c275396763247c240b2420146351fe10a65b7ad09e3c5fcb01593956aac4b65fa5a3cc763a4dfc8d6e0f38c76a74f8712c157fa52f1bd8b7e328e388590
 DIST calligra-l10n-da-2.4.3.tar.bz2 547805 SHA256 188298db0e25636c9048b0bdc0715f018249bdb854f3e8a55efb0bb8d52bdfe1 SHA512 96df3d8127e50f8fd3e0c7a80934029a816a4cf6ded739399fe02a53cd85539deec187324eb01943c4a5f36669fe60044c351aef3e3dae8959fad4f7f00a2f06 WHIRLPOOL 1ab4ae90afa1a611bb4d886998fe91ccd57d49117115aa104b0d747b37a5fb6165ee5fb8425d3786a5a3baeb1ba0682c120ac1474cd1376e7cb89aa58541f2f0
 DIST calligra-l10n-da-2.4.90.tar.bz2 543489 SHA256 f3d57ca2c19a38c45a7872ccf49025b66d77ed68424e21e48eb1cf4accbde8bf SHA512 fa54bd70e85d7338ba61d76a63c33aca4697fd619e6d6e102d44b8aa6d6501a498c725146f6b27d5bbeec447853efd35830bc959683e934fea7bf4733e0740c7 WHIRLPOOL d74f26519207bb7e32908d26261dbeb576d1d2acabc7d0007300e195b64c456be4ce2c43d6c086e13524e9f796ac40149ea0d3b2c7d75e97db1a2b32af5fd346
+DIST calligra-l10n-da-2.4.92.tar.bz2 425269 SHA256 9b3f86cf8dede82e4bf3f4e3e8fdcca32b8ed283c41506f2e4e27492616d44b8 SHA512 a9b1901171dda597b0e087983af26afd7b03606c237a044ba109ca26eb000564a78af9cfc5f66719b3113c6d2bc9ba322da93bd76eb5725015d99f71597f1822 WHIRLPOOL ba71bfcd2d960378827c2e52481b0e1ff561ac27a825fbf7288b852ffdd2fd95bf3422def38c1a0bcbe219d98143207288d4e1ce066f90032df49c83ee52b0fe
 DIST calligra-l10n-de-2.4.2.tar.bz2 717949 SHA256 7956e869fbad1d924c75b2f81fdea67096dea2dea654c62ff8eeb33c900b9134 SHA512 952f76cb16bedfeb06ded7949f50992515e6f493e70e846741a9349636b1f8849089ad1f2c935f6e0ac428b9879cdfcac2a8a25ce942c1d3002f8100b8844c0f WHIRLPOOL 94883bf2f09fb56cc714f6dcc62849853bbbb150f7267c1cbf778468639741735d840d814c8b00ce4fbc41a968f60958cf38dbdbf083233d35ce0e2ac1e50700
 DIST calligra-l10n-de-2.4.3.tar.bz2 716257 SHA256 87b449b0f915708c7bba29f5a11ac27fac96d17f3ef9b7f5275867ade3c4d610 SHA512 6dd99fa3b90d080145d7ca6a21c6f7a013c745c74df3c679200fcf12aabd277ceeaf70957e9741a0c51d2f75e4a470ab8da203b01009af82e9d6387259020ee6 WHIRLPOOL 2ceb2b61e793b21e8d3f0eb49269d2281a25efb0a8e94dfec4e3db088cc50b0156ad96d97326c10963066b9a105bf30c9b0008cbd1640f503818327f68c0f34c
 DIST calligra-l10n-de-2.4.90.tar.bz2 706666 SHA256 08d8d9ec8bb29bbb9814a8f8deeda32ba686bb9d4d3fbaa6a0ce2a9e08979efd SHA512 3dd1b967e741267fc140c6f9383cf145c782affe175224c49ffab88bb3ee2e0dc5ee1b6c80b9db87d7bb277c416a3fd4b25ea3751c2f1cc6b11f87d638c32ba1 WHIRLPOOL ffd2f76dcf88c0423253d1848fa05a39f87dc42c8af8114036d2b5ed8aa1855ee8b426b1b2fa6d63b91a41b72a95f2d375366f141ba4e73db5d95b4793b61942
+DIST calligra-l10n-de-2.4.92.tar.bz2 707195 SHA256 8b790c722602feb0109d376aa40d1e3eec4c7c9bf91fb4d1b96abecfedef73f6 SHA512 ef9e295313ecd74dcb5eafc3fe93e595189c1df1ee7eda60a5f8f8718f5db2f7ced3a02d4c80e2ad48f521ef3e194f55366fb9b21e61b8932cc01724cc4f06b5 WHIRLPOOL 42e1a29253b8a81af61fa8fec34d50cdfbe2c7686ef16b92202eff6f5507bafcbe5bf51269b35acaec2c354db135e7baebdf0a86e2ff58ddae5c613584818730
 DIST calligra-l10n-el-2.4.2.tar.bz2 417911 SHA256 f0fb12aba3bde23d3926e7d14503663b14d31368c19bbb6718becc2bb451771d SHA512 c6b1bb15a3fc740774077e2b8a44a0a2ccd19718139f15f9b886b85d5b1dbccafb121602def40c08d03b68d107cbcdfbe5b2943a6020cbd2a842b9fdb66cfc0c WHIRLPOOL c11bf0e27afab72de61db7e6f40476610d8a6acddbf82674e62154aeffc21c301be63277314c084f99cf9008916a9d3549aa6c0ced7a3330a032528638c10440
 DIST calligra-l10n-el-2.4.3.tar.bz2 418000 SHA256 ca6499f079166536436031ac59bf9a448a519f479f63ada8ad4fc44de13fe506 SHA512 62228d59c07f59cd4fa6cf3bd239bb070f770981b6508f9562865d2216890791c1d63e360d337fddbaa7ca2d0b333cfe5a5cf6d91a0b8af8c1494427bb55200c WHIRLPOOL f72abe9660bdb2d523bd4c2b02bae0c132eddfadb53fe06990fbacdd13984f38f5087b87ed988a9519d04e765a60c7abfc50ae67c1f502841c01aa3262146928
 DIST calligra-l10n-el-2.4.90.tar.bz2 412482 SHA256 12cf9e6a0ac40e2d79ddc234ba1b215637fddfb39ecb3783610e816ac66f8e08 SHA512 529b4c7f5e17879137126fbfa428c9ecce0b67ed75d8262316be6ab3df62c30ab18c3a390329820f005c3c13a0383e638b0ebc5922bb6dfafc3dfbed5a4327b3 WHIRLPOOL 048e91db8209a360c14b450865a50631ce980d40a0da3816d400018183c342069274585382bab5bba388789894654ac8d14bfbcbf98e1049cfec5382380905d2
+DIST calligra-l10n-el-2.4.92.tar.bz2 415623 SHA256 2934a3c06a7403d58a05ea3189b3342ea6737247a734768263dc77df552644bd SHA512 05352ec285dbad3974d2ff1023037ba86151c69e3c9142389955366ce736f581b23efdf1d9d36322154eea8a4d05b4ebec2582e16b2a9f72bb72798409e59504 WHIRLPOOL 50f41d2f59b6cd7134e8ebb62d7c054a6be3cd2d164b1dc41f92761c3b9b3a2735254afbc5aa9f6c6d69176d65cbcee9261e0669fb2a6781629c42849d0dedf6
 DIST calligra-l10n-en_GB-2.4.2.tar.bz2 391579 SHA256 79508089b486298f191c5054ccb4c4d6e864a3c149334be8ac9cf6d7fe96efcd SHA512 5e6db02d35030f37fb059fb34a9e68262acf9a36da81e76e2fb5a25c959b70c672a4d55e3eb6206b6233cd269ec39714c645e85fc0678ce98c6cde6a23b386a6 WHIRLPOOL 64f8b95801fafd6feeffa784171c330705d5088d74e611087002ad783a6adf9de9649092e63a5246447bac5a6f438ec9826ed2a9f3da32988a3c9e3d2783764f
 DIST calligra-l10n-en_GB-2.4.3.tar.bz2 391605 SHA256 15d5fc33b8590ab07488c045ffd088f804e791e6fdab95bb9c0188175cfb152b SHA512 7011dc130508f150580eeb44a8da5e0cf6d70f1fdcee6fc99f4cc02922f69b124723c3a0559d4c7e14e1b42da3c34a32d325fa82464de1671addb82da85cbb0b WHIRLPOOL 2973fc96aaea8b575dba2f8acb0008e2d6e10d7e6a732a4de33e85b53ac03a5ec04d30f05e14e7b12ad87d6ddb8fb4337703ebde4d5728f03915469e0222ce05
 DIST calligra-l10n-en_GB-2.4.90.tar.bz2 387239 SHA256 17ca5b5d4820265bf3a3e5cce652a8f4248711304e80e4880af6e0041f447b73 SHA512 c02d3fbcdc4dc47ef4e1c1634d2723f206e491f2f46173ab7ec2308240178070ab277589a80834b1ea78fb241010932a5b4f77ea4c0c74213cb1179257c71aff WHIRLPOOL ecd8bace757e8e0e7e963de7ad2d641298af21ec0513d5c052831cb8df84e8991833ba71ef7b0bbe878b4a4d7e2c6053a4ac45a8503afaaa7e25b84867132015
+DIST calligra-l10n-en_GB-2.4.92.tar.bz2 389707 SHA256 ea819d9ee92d24265fac2b4fb78f595a787d38c4b59e4786a2dc4d16f089df8c SHA512 e0ed3263a921a563779fb1f56962b5f8b421eaebc313c517bc65559126960cc3493e640424f6226ba2f504504f776935216a310c51eba7f8a1a213411abac96e WHIRLPOOL 44387d5dc7f7619d781f82b872936e512e476935e79da075bb6ddaae12846ab9a019c6df8a25247b620e29796c622266ca302fed8bf68108bd82523e5389f717
 DIST calligra-l10n-es-2.4.2.tar.bz2 4378526 SHA256 a7e624b663dcc9e5e970a8b6831d9cdcb7eaf73fd5c6e2cba4b52511827f73cf SHA512 c02988914b5c193e8330b67780f18e391dadf751ff213d276c76bdb04fd290b189a8e756ec8ff7e82eeec253b052140204b11353b3998a720c2c6691fb24b4b9 WHIRLPOOL 37039c3737e1e5cc0e51055f571aec2b5851e3e95b73c1601bca26b84082525273579cec05e5c64f15b9d5edfb2ced5ad010787cdebf878ad74e4335de8995a8
 DIST calligra-l10n-es-2.4.3.tar.bz2 4378724 SHA256 6aba21eb1aa42781a1b511434f3c8e9d47d5e4d2f7f79a9a945b584986c3e647 SHA512 5431c06a3bfb85c6efb8eaaa1fadbcc4dd73b34eec1ed6e8382f413b2745ec7f5fe911d1e19dd68c78228efbbcf6395a5e3feb68f77dece9c975efd0331a1ff2 WHIRLPOOL 4f8ca937641274982010b47e4bb3c952acc2ffb6bea9d1056ab1b8371465a353ab21b3ecc0cf9bf9b5199556d61312531f73b62ef4a0e276334381657df0be48
 DIST calligra-l10n-es-2.4.90.tar.bz2 4372775 SHA256 4290e89e135792be95806dda59afb9df46aaaadd1d99441ca2a07a9a374ba4c3 SHA512 b4673b6c33764ab45781c0beecc79c4405e67a96371e5987b34fea27c1a3f8ef1a88c2454d913e08cdcf1aca96a33edcf15574c46547ed82deada842538e5174 WHIRLPOOL b4363938c9e5252fdc9c89603b2340eb401a2e13b16ace329169a37a19d7a7a86fb97a6211259195671f3fd2af76656478d5f96e9f4e85034a6c0efe8b082ef9
+DIST calligra-l10n-es-2.4.92.tar.bz2 397392 SHA256 5a0acfca15424785a582eb7e2739836dcf127c9ca648ce3f80dc3e7ca747d205 SHA512 2ccfee7e3c86a70a64d43a098770980c9d1e2a4c4121678b8e2f16f5dfbbed7931ed4bd022b42761b7a1acf80d9a48cae4a743dac64d9bf1d364c05b75b963de WHIRLPOOL 18c0bee91705d999dbf46c3d3028e66ef42315fda1ff83931cff0d4058551259c972f085906b075957217b1d7f5bd5e06fb1e9970c1f25027aebfa87fa3c995b
 DIST calligra-l10n-et-2.4.2.tar.bz2 686583 SHA256 77549b15b7aaaf5cd79b9344a161063de3ddd08672cbe3eae2d2c601e0600906 SHA512 fd5e511f460e42c84c85ac3c7256c3a171869fbe26395671e31f26f31b386dfd490555c4548348e173d5657fbf126b1aaa9471e28128236c70bbc54bdd91ed55 WHIRLPOOL 754dfcf2a10672c9b34672cb7aa528d302652f00d69ca1498ff5500ce2013c9702409c4e8dfcc4f83c84338b7cf26295904bfc618016bd2f65fbf301a05688f5
 DIST calligra-l10n-et-2.4.3.tar.bz2 686649 SHA256 0726db86adbfa1ecc12c48af329a739343fdcc7a42e56c1337402880bd98ab38 SHA512 26c77e702d5bbda16fd5af57f9d5bf6902607ddad3f7bd831d040ae0cdd0336654e6286aefa4d1894871c275a9f75ab669558d145f370e3e6e62c541dafed6c6 WHIRLPOOL 6394b74679d1d9e72908a426b765bf17f361f018d52271426cf9bafa33ea5d4e1b1ea066263ef1f6afd531faa6719a1a73412ca30b510e2f3fcf8507b3ac7e04
 DIST calligra-l10n-et-2.4.90.tar.bz2 682563 SHA256 f67d0a837332467666d1fd1ba1ddbe6e6ec96c4cf40492195fe261018a03eaae SHA512 8db1d66eb3464ce361ea0ee6365960a4e8ba2765c892a8050fddb7f5fd9889712bd6dda991f2c93fd9705bcd6854afde044ecfbbf709700c972dbbf62c08c1b4 WHIRLPOOL ab03b49d67dd2c6fc4b810e472de84419359c7ca20d03aafa841cada21b0e7afe5b105460af4ecb03194f45c042052d05d46de54103b5df071bcea02bfafe584
+DIST calligra-l10n-et-2.4.92.tar.bz2 661499 SHA256 fc067e97838bd66356ef1cf22c55aa419ffcb7f43911ba722046fd19842d4f80 SHA512 14a4c236f9a2830f5b22b59f045dfb46faad6dabd3c1f38a836037115b945de79ab18e2d0b374c54c7855db84dc68867fbced99730d2f59d546a691132ee6aae WHIRLPOOL f96a6ed9d15f2e0911ac1224a284529c2e7bc5916e35154fbc69e350268561da7fd0e47cac5178936864895ab7ea2c39d901beb758bf305b47037bb7531f3b04
 DIST calligra-l10n-fi-2.4.2.tar.bz2 404798 SHA256 d2fd27568fe71cb56627928f5949ea0dd1cf7a96d171c64c32280c790ae8f959 SHA512 0aab918423c749ced9f0cf150e9b757a3170a7df130f57872df90ca8d81a55e7b71b4753a5dd32e63fafe065b96cfd4b5929262424ace61bfb666f8a620562a5 WHIRLPOOL 134ef2ef294335c714f87d0a66b2955f7fcc0d19dbd21986f14f4707d3efee1a7d9c8ea9e6e16ca36f778810345194450c0dcaf126c75c2c1fc134a6ff8c4a4a
 DIST calligra-l10n-fi-2.4.3.tar.bz2 404201 SHA256 3559a25320abc875b6167ec1dc5a11238dcd80321895be4594cdcb8da2b8c31d SHA512 c2cc5b449f2f712600cfecea9d390d762d8fabe64410937cabcc80fe2bd260bf7b79fd28b204fc7ad4f3f08f870b148df851d203e52edee6735287385e580fb2 WHIRLPOOL 13144f291719bd2038ed4981f4bc6add0583390cea4ccba981a17d9a39f1d76102bb6826f2822023204fb95b2a0211e0b7b79d2a1dee21f084c4aab39dd11a4f
 DIST calligra-l10n-fi-2.4.90.tar.bz2 396183 SHA256 1d117072ea4df236e566a87f0522d17b715b7917940c32320ae28e1c970a581d SHA512 11d12a321f43cf0d39d3d8347db6f187a89369ec23708bb6c5b706a7129f3a227ddccda7fd87544c42cd7fe85c4c09e9bda7f8189fda9b0b9b121a48d2a95ba1 WHIRLPOOL e19c71431c954e660a06d32d0700abaa9066f7d7fff2f5cda5b290833ffd74a089ef214da7f16c0905ea6309c7bc5c397109e094d85e202d7075a716057e7853
+DIST calligra-l10n-fi-2.4.92.tar.bz2 401443 SHA256 5d91c276797a3bd500ab3708c38d0340f6646db5403e8c9e417a88c77df6db84 SHA512 cf193fa1bd1ec0765cfa853b47e107db23c31930e23d4c7cf2c0548692e9ec84ed654746e22b3162a5b9fcf97ccf4f5899caf45328ec403f5b48e27c37e7ca88 WHIRLPOOL cd38643d21247f462d7228557c53b05763f50de61e27ea68a27220987fb5105bd2d5941c6f00ffdc22aec7f2d7537fe36678db5c8df24bb9ab994439911b57c3
 DIST calligra-l10n-fr-2.4.2.tar.bz2 5612463 SHA256 77af170a2fe143cc986794c0282237f2d0003251b2ca8abef503cfd665e8e59b SHA512 84f9d5fb475c6eb81679a3f6eed4357ad357b4bf06437ab4b74784c9f15b4b4a62ba03ca992642d83fe8da34b76e9d7ca7e3c995b30f642ed35b0fd526bddac1 WHIRLPOOL bc1bd6530a14f6b62bc27d2cd8d54ec64c66117d6ef6bd14837c026a02d87e267c7d35ddc4563804f3400f463234f07f7d36539c9436036ec1d35075415bee36
 DIST calligra-l10n-fr-2.4.3.tar.bz2 5611729 SHA256 e4ccfd78d558669d1707d6e475653d243cf24d0c44fb54c944f8c34fdc297006 SHA512 e869769d6f0a7efb1428a2e967ee7a89b132976c1fb338690d4f8115999a9e9a9dc54664f8ac8933b80f60a057e707b2955c39a330537d1119a690609c42cf23 WHIRLPOOL 81e7bfd275371fd205dcc4d3deb9ced31adf4e0a367e234311c6a061364b372f671775dac4d47ec9c03f1b0ad0d89ada6b5f241bd1d287c1ff3a7a3213389942
 DIST calligra-l10n-fr-2.4.90.tar.bz2 5609284 SHA256 c306a10ca3f175e7eae8a7fe1c011317fe12577061a8c31f3c5cb77b92fdc444 SHA512 c64e6c63db712ee0c6e7bbb35f11ac7767b30b39bf8eaf139a61163a1bd7112d19cb4be290374013ffc716f82a222ba8c9f33169b27d7c411caf455bac09c13a WHIRLPOOL 93abbaf2e004b342bd4f6480e465c15903759da355c8b932e5afa78f2461571c262504fab9846e758e4e7698e22e7a47e9893d0b0f0d5f3f810adf4c91a7ef7d
+DIST calligra-l10n-fr-2.4.92.tar.bz2 470807 SHA256 f59bd29ab09598d51bbba4b9df9d1c28baf46eb513c84e3a6ee35893060faf83 SHA512 e9cfd259328bfe0cf3f25288696c762d1ddff3b813605725e7a8bf1002feae4cbf424a8694a6ce0d64c7c32ff4893e47c0b232b0fb013e7f82de4720c9ccca43 WHIRLPOOL da5a1f19e810efa810f3524ba553a0aeb11eb9fa86b42a57ca1db28fe3d3eb0f462bc8ae1369bc24980c39c7a063e44e1e13e1a42a0fb8df00c0085776a1be69
+DIST calligra-l10n-gl-2.4.92.tar.bz2 388318 SHA256 ec8bda8cf388327b44907bf4984fc6e0422fa2855f18ffb602fdcfe8352322fe SHA512 e3c2351720b26c26c79e481379afc848727c9940825e9a10141eab0602aee6b0e5d8e5774b46a4b8e0cac30268cd6497d4922709b0f50ba435e5f0a409ccf3c6 WHIRLPOOL 6796614c98a0b9f8c35778a923f1247dbcf76ef3e6ccab526d5255f14e871d90ed4e01fea2e6aa496da1be8372809f44d9d9032e023d226e4f62c29b77e5bdfe
 DIST calligra-l10n-hu-2.4.2.tar.bz2 447760 SHA256 d46332e92ecf5050ce630ce91d982ade430a15646dfaec906c63759371cbf0ef SHA512 d7acf3f639b1459392e56615abee1cfd43036e849d967b256ad21277a7acd1197b6b92f72ea98656aae81cf000e35f4666633c819d1c2a5dac3d9ba7d93efb7c WHIRLPOOL d8b81056e409aaa6677eac47506d8518dd5314cfcbfa487cd0d66ab5c67cb008c1a4646c8daa0bd94dbf1e461ef32d3a3dbb41e932ae3668275bc5c02c1382b1
 DIST calligra-l10n-hu-2.4.3.tar.bz2 449165 SHA256 420a79e03151572153d091a1b8e24c8296dcd0bfb93cf40bdd76a966c054e3f7 SHA512 192b98b8f4a0ee92bd8551000d446d8a60230767a128ea16f971702d376e5c4a78b6cfb139aecc806445236dd52c4296aa7524a47ef327b0eb2060521e040184 WHIRLPOOL b844d6e60550939011ae17db1859d6cd6faf7d92a615166fa9c0b39e523e030550f2d6efbd0fba83ae6a2e95bfb61fbb2c589c10a6e7495a6c65d14d4de35c0a
 DIST calligra-l10n-hu-2.4.90.tar.bz2 435865 SHA256 619c87eb183f5726b501d2bf6215e66980cf48cd6a4e5cf0dc3c20957d53be97 SHA512 9ee78369551e95a76a2f1a7a83690b39fd87d0d7409bee1eeecb4adc0861380ffcc5f578e215a30ad9ac6b96eef9fceef0030b9f4e8f96a9e74a81220f1bc69b WHIRLPOOL 2db48f3053d0d8a2f60b671c2d528e03f351dda3556a540c8f2b9b5240b8c434a758df102be4f473edeca08d76b0cbd78da00f26cbb7bc71e841f9a0335bbb09
+DIST calligra-l10n-hu-2.4.92.tar.bz2 440724 SHA256 ea6193dc7f9781f4852fef56e00171600eb84522afe0589e03c12663d80211d1 SHA512 c4355567a64797939d1adddbf90dcf9bb347826955e27af017732f0eb6acd9a02afa7e2216f7c540ebeab0131911313678908d4bf7cf42b84b9d90c878a30c13 WHIRLPOOL 35801a8164808b53457180ec1f05b38c010658ae86556d88affaab7877be0110bc10dabc549c205a8fb4250588f1ec30c09d70fc7896fe4f5df25bbf75a140e1
 DIST calligra-l10n-it-2.4.2.tar.bz2 626408 SHA256 8cf43e50cff18e12a40380267e626fbe51d5c20fbbd92e04826043462977ba9c SHA512 83f1c5ed07b94979457259ee26629494ba25302846c10f523d510ffd328d2d1d5904594895598a7d409cc002575cda9f3dc3bd03f5252cbbeed4de51042c6a17 WHIRLPOOL afe4fcd207be5e42b66942144b29640b826f6f41f857335a0d9d6355d494f975ed50e04ef13b97bbc33255ce3a4e5e65dc6d73e72d2aa02269eebd368d2f8f2b
 DIST calligra-l10n-it-2.4.3.tar.bz2 626627 SHA256 db96bd2aa09fab0533439bbabd7de8467237fb67f42d4d8a5bbb4b6e68dc383c SHA512 fe4fe1708ca7303763242e2ed2977e0f2b4d6ce75a0b6bda2837ff134c6fc47e6a1f91d40e5da6d0a716210cda238e4bee90db122a6c4931102bee4fff47aee1 WHIRLPOOL b795563027eb8f51b5917938a1bdeb7fe031f57f6cf4fe628f06374d2ef045a0a60c2857e37a6cd480872ab46a3bf1b2909a0deb529030e2ae333627d082a2e0
 DIST calligra-l10n-it-2.4.90.tar.bz2 559822 SHA256 5eaa1797d2d87ac88faeaf932ba9f9ece956f48baeaa17a323d4c319ab10d4ef SHA512 b8a81929450de85576a6002eeedb5aa1e462220d648e14ea4f7f58c9bfdba011683a5b4e68d83681611fc93cb522c423ff5c1a17fa2765b45e5bf1fc92bb79b0 WHIRLPOOL 0fc4ed2aa20c35cdadc4fef076e6d9943fbeee34d25ed897f09725f4f3c2e0a9b9ee15663c36967c241c88a36555123e20f8bdd34973f87b87ea8cb27478adfe
+DIST calligra-l10n-it-2.4.92.tar.bz2 622285 SHA256 759c7c6db13ed4ac73a44cd66cae1d96545c729ed38c5fdab774bcc4dc27fb71 SHA512 3f01fd7e6dc89bf50b656278303511899d647d31194b505e0a983a2d3699491594c301d2eabf501b8da965a2077652ade46aafd073aae80303f33041552c4461 WHIRLPOOL 0297a11cec8a86ae95bb862a17e7ef3c6ae8b2021cf5c48f5969bdde193a89af22927e1b49318d6d01d5ec160b8405c14c284b67f91631cec06ecc674ae64c17
+DIST calligra-l10n-ja-2.4.92.tar.bz2 327394 SHA256 ea6e49129318f2ff6aaaf0450717a4bfb96b19d10088ab69bd3788afc2de58f0 SHA512 6858b3bc1dc96b35abe856acd3281687d322b35e12f70f1454d82cc5d8010e2ddfb731cb05b3f37662626c727e1b5a54da28cb183362cc1f0a3d250d21be198d WHIRLPOOL 7f801e5de56e11a65dbaaf56ea0bc1d5098901f6d3b07b528bf91579295b1b8253cf5aac8b5096ad19d01bc9a1b2f305b950ac350e4cd7a4411fa4ffa9eaa0b0
 DIST calligra-l10n-kk-2.4.2.tar.bz2 405525 SHA256 9be217dd8e3040c26a24260274f8b12b464168ec438adff62f99e00ca55b1685 SHA512 5fcfe5a12b5f7f44148b831c600475c60e59850985da1e463c5b89f0b29c0cddb49c1e2e4c6983bc1be444f71464fb4284d5ad323f9893b024d453feac92454b WHIRLPOOL 71f3ae15ad7f01933fab4933726acbea8445e67437759d5cb78df6655d6d02e1b0dbd53df4a13d8bd0e891a85b9c7e568049f47aaca41ee8325bff0851b7c614
 DIST calligra-l10n-kk-2.4.3.tar.bz2 405473 SHA256 5585788422ea823d8c1daa399bbf8ca9aa7a9b5c0e33b343cbfce6ef1c1170fa SHA512 e240d7c293ca710e218532d5f5ee4845a7f9e082c71b42d39b74b93f0b129ac6de3fadc4e1a2dc51b734d67aee864f33480dd1600a2c785a6ebc2ae11903d8dc WHIRLPOOL dc8da57ca4aca4b7f25af62700562758468ee4f0027eb3b2db5fa180cb8fb0f2f9be5ced45fb56ebcd33f0e884de870344c35eed95bdb8a933af3a486a33feed
 DIST calligra-l10n-kk-2.4.90.tar.bz2 400695 SHA256 3c0c98bb557a86044e9455cee76ff04a547d3be62e5c49da174d5d72e5abc728 SHA512 c7daa186959dde05e7f487dccc7b37f1598f991daf35eb223f2bfde14677644b0cc8f1317a5b512882ac78ee72c12bc2787a917066d29c95db534b81bed2521b WHIRLPOOL db596cb3aebaa2a83ea8f5e025b74ddbc9004b0517b525320494902f19335a0b2d7fdbf1ba666fcf76ac381e6f3a09926bcaa9dad81fbd6598adb078dc38ff4c
+DIST calligra-l10n-kk-2.4.92.tar.bz2 403856 SHA256 734b03d049db58199f6d6635ffc537aa1e942552453bce3000edaae9a4481042 SHA512 1a8ad7cd9b97f6044851c8dc5e958cf69039868b5a1b31f7a8885145e3eb3d33accc1f48017a8830a0043a24461dffccead5e2e39d8da5afd468c686afa43ffb WHIRLPOOL aa1c2895d2a25ad68e2577b554fd0bb712c6de7b6f2bfa5504705c4c1807f191cdc45b1f3f171bea4a7f552280aa853959a7f9eb97befecae47c2384875d5b69
 DIST calligra-l10n-nb-2.4.2.tar.bz2 367184 SHA256 0f7e99dcc03a556f617918d5f34840353b8df951f1c26b62cfd6a94524f3a38c SHA512 132227cd404920eac4648e3afbe3946ccbbec0f091ec9bc85069c22437236079369b912e027ab66570ef170a918b80c3363b342033931a0cd52ac05bd973a555 WHIRLPOOL b094bc96424dbaa8ac6c9daf36aca7827cd7dbb800327b28d2f9a7fd6b3c5e5ea5f791df299c22899218d579e8150f10a9363a7435235e8569a2ac404b9eedb0
 DIST calligra-l10n-nb-2.4.3.tar.bz2 367058 SHA256 8923d881b68b955f881fbd39232a8f8c7c25387d35b6ec26eecb2f6790e50931 SHA512 acd63051ee76d8a0ffb26432010475c9aaa2d9bdaaa2df8a84cb6c00f286135fa7582b30e5ea0a3793a8575525e29f9d44d228030280c346977736eee23922e6 WHIRLPOOL 655930e9458e4a6f8c68839b45e93d0ab77e61efbe40f5997b085c84506590e7183fb95ac8dcfd0963c0a23dfa221bfa2dee7cef7aeaf16d67fd73bad2284497
 DIST calligra-l10n-nb-2.4.90.tar.bz2 356179 SHA256 e9313ee78a7657aefa7358680bff6e988e4ab722fe44e6f5be8b3ccac348b176 SHA512 2d26ca87d88ddb4066897b078d6bbbd34547fffcbcf2426dfd1349dfa5fb72741f78ea08db35a355ee3ae208098367ff89b6c00bce4adce3e6e3e1812a836b09 WHIRLPOOL 83b0d9470b7def9a003aa6228e134f858d9c20e0402b088c00a46c8b91007ad88b86e89a7c327cd8dae1f8fa244e4648cfb272d424ec5ee12c4a946f6aff06c7
+DIST calligra-l10n-nb-2.4.92.tar.bz2 357421 SHA256 f6eb2a33a263650972f78d120421722a8fa1ae2a7af8f2b4ae7d98576819b43e SHA512 6853747394040b2cbfa90cb859513abb8f8baf7b7d71810f837e250525ea9a10e4b34da34a7a519d8fcfb83dff7151bb1b3ca82d6c8170c74826c37ea764727e WHIRLPOOL 6c758cb5e000178ee1fbc13b51075764513326d996383c767c1b972261847717a3b8580a62f7d4974e7966a776595cf0c6f9fb0522c255d6dec5f84b9211c1e6
 DIST calligra-l10n-nds-2.4.2.tar.bz2 413593 SHA256 f7da2b4f174ff1f26d43fb985eb2cc2f9b146c27df551095a33417dc0bbbbbfe SHA512 f591d6eaf53d1a079917be86e8afaa127b880a260ef60108c15f3003bfd50fac784414d4dbb06c32b999534838fb940162d64db90e502e484f9eb20b2b293413 WHIRLPOOL fd37f2c581795e9dff3e27c002bd391c92f3c96c50fedc8def65f6cff300c2dc259784d94da32a34277cc22190b89b42a98083aa17a724ba387f406f8c50a2ed
 DIST calligra-l10n-nds-2.4.3.tar.bz2 413759 SHA256 c9dc91854284c8ba9246c737cc89269b4e1bb7d532e649ef1da05600b4858e7f SHA512 d8a70f7d16a08c3473fc0504af28d8dec9fa4f9ba603f8054199daddad54d2a2ef00182997c3c7b82ddb7093c48e6d825a0dff04058e3d7b77851b0b901e3bd3 WHIRLPOOL 7d6673b11ac7d88f6d18c1c79638d389da2f672249a52ba3e8d1df3831eed200b2543f7aede123783c2e3f5e3d76f3af7596819db524fafbf5ff9efa7c2f3f84
 DIST calligra-l10n-nds-2.4.90.tar.bz2 406346 SHA256 37a4e1754ba37647864a9e23199455306476281623be5c2135269d5759963164 SHA512 0436b8908ffb4ce3a2b0ffed2194c6cb9e2fd00e4f6649caedc29e39f22b8c7cf3da045e18f7dfc40a5cabe29b5214fd020057f17cd972bd29e7b2ad9037acde WHIRLPOOL 06a950b2cef847bf7de89fe63d72908b0fbfdc71203cfe6af6cb8cb22cf7f16599bf275b4ba00a90a9978d9d920a0c30e418bc206c224d3cc1bf212492aee78d
+DIST calligra-l10n-nds-2.4.92.tar.bz2 410732 SHA256 1ad9d665f637055a57d135440fb8157c162598a5c677732dbdebd32a27bcdaa0 SHA512 958073d62849b04e5031157a73ac0085a11f34a2db8f9b1c879dbafb4b4d33d26efcd8682770196d9225617b780dc02fdd3032952bba15535927fa6c02159b8e WHIRLPOOL 8af06c6089391999835537c927bc73ca90276acb415dfae73ae34852bdfc95c5707427ac2792cd11c0cf131c072dc778524dfa3e7729959ec2d5e4a74463e703
 DIST calligra-l10n-nl-2.4.2.tar.bz2 3101289 SHA256 3f55de4c0987554bdacc5f083fa4710b33f913ff243ddfc5776c5db0cc3e70a5 SHA512 deb0b375216760dff5fc22780ac267adcc90bb98f0a44bf89230af3a171f419e545ec908fa312868ba603c82779aa756ec581529133ee6bda92d756485af83ce WHIRLPOOL f0ebf484ad7211315ddf7bb2d185b6d75ed4043a8d8bc2e1a22e6a3207b888f79f397041b1454af9b800765b99c5117c21710d2036197cd2636f7f36ebab880b
 DIST calligra-l10n-nl-2.4.3.tar.bz2 3101190 SHA256 b615b0313a1fdb60c3021ecb6d4cde2b9f7d8bf620c80d2b32bcb4e300de629d SHA512 ff623aa61642fea4757495769f0bed48657f65202e9fd47f0ce8a94abf45568a3ce91243267a34509441698a2392abe14551a67e3c5f3522d05bc0573faa4115 WHIRLPOOL e8be12f6974585da278055450f37794152166aa47a29ece0b81c39c96af2c0a3101ef48393649698720ce54fe2de34143f78c0763d79eec83247cce04ebf0713
 DIST calligra-l10n-nl-2.4.90.tar.bz2 2596129 SHA256 b8479091f8e7a854bc873cc7993bb4c7ebf8a3415f4ecfc4e52f9e303da24bde SHA512 a24f2eaffb77a5da8f667dd4234507d760a6d68dee99a06a8aef16e65870bbd320a5df61cfd0a8709cb809ef8fa57ddbdd639b673bc1228fb909bd2b967d51cf WHIRLPOOL 34390578629d7b4655791e7212cd3c89ab1a7956bb5dfcf64badb764844a0642649cc6f5152f6a0810148468c9b15d68939441d990b7b0f85b7ba552c47fb257
+DIST calligra-l10n-nl-2.4.92.tar.bz2 2585381 SHA256 84d232f1f2cb0f906dd4a45c575a0e3557dcbd0df68b793d32f566e2891e8ef9 SHA512 764ff17497ea2cadcfd265e1c2b93d75d9326db0d3941ef2643416b3cb2ffd529414ea91cb89f3887020c20308b2af88179d654d9eb7b7041cb19cdef215c4c1 WHIRLPOOL d20c794fa58d0ee7db792bebb94ffc05b2b7e7cdf5352b225c515888f02defe7d97ddabe4148dd3e732b2e422fe4ffe3c2edeb0dc52f890e4ca334ba6091518d
 DIST calligra-l10n-pl-2.4.2.tar.bz2 430288 SHA256 1e9aee796c2ae7f47359d1f2527801c920f568d16765631e7c4ebcd3998fe1a8 SHA512 d55cb5569c380258b3a893d37071f79c31469589e9f7cacb85808a469482c9b326c5203573b0e61b4694900cfc2eaf24c1819c75e55bd75fb71b2ca262f14075 WHIRLPOOL d86c08bec5e640549574496c7ac9fb98156d666e3b124475712016934d45d9643c8e03cd84966209a247ba6ca4d7994095f21df38b3d4d8b710e0e6965c19c46
 DIST calligra-l10n-pl-2.4.3.tar.bz2 430261 SHA256 c5705e69778738b525d9a14d816f44c5f15fa24ded33f53b42dfdf5487ec50e5 SHA512 91b75a40c590a754921f849016f8ce2f69faaba4a401565b619514246881a1e95103370825a9e9c30eced65160b8a81d71e1e62704c826424932b9adb1844dff WHIRLPOOL 6317a296b3c40abfddff3ae0bd570ef4e59a0ff7a9668e9ae681c1aa4b8f1c2eb4ebca7daac47fc3b7b2fa6118e692b10f2248c722acbafb2643691cc3d4164a
 DIST calligra-l10n-pl-2.4.90.tar.bz2 424546 SHA256 d2ef8d791eed17a3fd8aed0e1fe321dcba67e73da34e5239a1b46f093ee4e810 SHA512 63a925336d4a1c5d0b69600c81a89b036794630fec16f877fc4e2c412584b89c13eabb7f266b9006df0b660482da99f0ed496c46cb314fe46a5f9faffb12a62f WHIRLPOOL 2d8838ff128c36ed360a01d2539c0bcc324991c54f41ee1697840c89c962983fe7c52ba828fc11cb76ed4b66e26b3f5f8a3e2cdb113a37dc54e923f34094e76b
+DIST calligra-l10n-pl-2.4.92.tar.bz2 429127 SHA256 40a225bf9ae99b177c2b3abca36fad63b458bc9705541686e155a693bc2d31d0 SHA512 da0e4f0939144375b8ea2f8c15417672bcc838cd77b32907616e62151fdb7d52cc3d3bd3bf5aec102eeb606f115dc69e233b07cd2a0aea588a25c2a606bdb799 WHIRLPOOL 6b454a70bb402a7464d042ae5745fd8f8ecc2eb54d0e046512c795c7934236c822eb113a2805b3678262eb4e84eb16842a500444baf65a42f8613bb3a30f221f
 DIST calligra-l10n-pt-2.4.2.tar.bz2 661473 SHA256 07c78220eafdcc4bd650658e969ed44ce63e3c727f4d20af80adcf4472290247 SHA512 9d04e82c802038c3c7fca4a5ea40c5149b34f168bcda283576368085d15c7aa6bfe1ae4e810debe044ddc0ddf11fdc2ce5c08a7528084b176a6e5aeafbabd8c6 WHIRLPOOL 05b0ecbda64a291c33db27a40b6a7a7f66be082b3b2425c4d7c00306895d2b7b746eee6bc39709462d6fbe6d456a07fa038004cc4c2aee4ccc4142de9615187e
 DIST calligra-l10n-pt-2.4.3.tar.bz2 661455 SHA256 135754edb457f99c288733616e8aac9c3275c3c151e6934f0df098e49e4744b6 SHA512 ccb8d2f7e13426f81abe8b53d3f1ff4f8c3820823ca21b39b44f8778ccabbeecb7ed7c14a1b95f7e56980ed1ce0f55df46ea89db7162ecfd5ef4c7f965dd3bba WHIRLPOOL 2add787cae8deaa0a7cd6f82e026c29bef82f82bcca9834d5d61b13397e79e1d05296cb0c5fba720192410a5b82046a85483afd4ecfa2e4496a2548d57066d04
 DIST calligra-l10n-pt-2.4.90.tar.bz2 645009 SHA256 6f651c59d52a05633cc7ff536dc326f50d2214aef9aa98a0e71487ce50e8eed2 SHA512 612b2564df283554de44561e4ef92a7cd4289cac1ff434728bfd6c0dded82ea23e7f75e13e122efc4f0b6edefd872cba5132f786b301a59034b862ca1b91b51b WHIRLPOOL acc2a2591280c9e0f56710363d0dcf679f408a60b13d434d07e86b58710b8ebaf55b3b74ad8d4133b7158f7051040f6f79b6b16b2b654f20402c526c3467d15a
+DIST calligra-l10n-pt-2.4.92.tar.bz2 645670 SHA256 e342794f67b72d6e281ec3d4143db7ec2f69317271b05930f90eca37f849987a SHA512 6e85c72b9a08960b76e40e1ce0610250f1198d7d3335da82d9c4b61229e6ce3bff533b8790bb4b6b84bb01a6049e05b4a2817c8849077206c19674ab6891aab8 WHIRLPOOL a98c05b039d850b499ff3a77ff53543b9b18108e986eea0e608a4a0d07022cb3aac80b9b7dde74d3496991ee5c9d1bad9fba44d1389e2265a6614f0a5b70aa5d
 DIST calligra-l10n-pt_BR-2.4.2.tar.bz2 739210 SHA256 5e63db1dc1333d8bdebe2552b72c1aec0be0c80f3e8e6bb2672d904af7a0f9a8 SHA512 35f88838b86120514485075c8cd60373dcab34968033a4f9c263cdc3c6fe6f54346dde9a54fbc4569bae441eb68d9080294b1b611e823b3f0394795dc6ae85d4 WHIRLPOOL cc615d5fc58da60aa6892ec1ed9c1fe9d706f4c0d43c05269bb198c7cec137cad893864939df2ce3f97bb4a0f14ad97a4c89d7987d02d124a21c076f1227b088
 DIST calligra-l10n-pt_BR-2.4.3.tar.bz2 739611 SHA256 c94943a93024bcadb595ed4363516a091a399fe9a7368c3365c24c7e2811b6ee SHA512 caaa86d5bef8148b75236fff1e12904b8be74e85181b0ffbdf97d2ea692b27542f0e44a25586a537f0e38b906cc0f3cac4f394c67054fe3eb0cc2ae0ad57498b WHIRLPOOL 79e287bb79377d90c27e74091677e7a9f856242303386852c11fb3cd6c7a846679746e5c9e78aff231dafdf2c26419154cf4e57e4bf4b96aa1dd12f4c38849e9
 DIST calligra-l10n-pt_BR-2.4.90.tar.bz2 705814 SHA256 6d60c436140682bd72712a6f6d61015d83b4a9826d8fd635378fcf1e2276b93d SHA512 7a75242933cf59f8b78f814bc9be85f1d1f54871bd7aad7cc0a9adf580ebb95aa34855574de2e8eeab15f8b19384689055d40948de4c6515081cedc84d76021e WHIRLPOOL 961b90b6313b581c5e24fd18b881086ff7ba917b853b4819d168b24e0fd41d2094fb596e2515def4d33f309365ab6e6c59c153a6633e16057b64fd99aa5e115b
+DIST calligra-l10n-pt_BR-2.4.92.tar.bz2 694063 SHA256 109cc9134f98686c11a1fd943fffe69d07319fca96b029bd715a63d37dbfa7d3 SHA512 326e47e36abe2803f3b70ffd1300d95e61a1734961d052a1f671ea582b7cf45feb260832cd3b305de3d09500226ae86181405dea1f1b6313bb8089847be247ac WHIRLPOOL e968d8d382c6984b75a313ac4a8e988eaf496a378eccf00d14f94155c0e6b7bff1e915aca460097e8a5dd847c63ee8ea4e89c63dea9e84df4ca8499016bb4bd1
 DIST calligra-l10n-ru-2.4.2.tar.bz2 582200 SHA256 8a7e54ebfaa9dedb2ac599373e4ae08588f1bf5889223b4e4cbe152782c25046 SHA512 2e9426ea062a0280a77a5f3a1249c82691fe6d43aeaaf1cf7776356f3d53446115dcd6b632981d162ce9d7153019cf33d87aae60d2b378732541c15ad104fd20 WHIRLPOOL a657d47f2da9d0f920132ad2731b4820cb69fe7b41ed948127bf0f22ea5ffc0ee6177ed3520b390c940fd6d5380667d381a4024367b79290061665ce38cfccea
 DIST calligra-l10n-ru-2.4.3.tar.bz2 582280 SHA256 d830e4f36a1bc2385395b7e13b96cea8e08911c6c2385057f241fe446bc1bd0a SHA512 febf426d8135599adbc5fcbe9872c86a72afbc212e965833a4b85b7a883e838db2e2273b376f49491875cb6470aa7de1bd59161ab4845aab590aab9fb85a6186 WHIRLPOOL 55fd3f3d7f5b40820528b4bd6c3136b1204bcc716b4d771ef04ad58ffef4dd8fe0092c2a9dfb8e87c9177dd543b385d9003ea3281522dfa72700ffde31b2b31c
 DIST calligra-l10n-ru-2.4.90.tar.bz2 578671 SHA256 98081e0483a36faf28d15eb5c7d8535e4308c4664feaf0f1c722fdb93dc35132 SHA512 cd2f6ca897e90c8a6b57da019bf6db94daf7be531c842d4d0e1ad0122303ff9bece6e89f95f1cff9a2deb56bc2203d4d83ef13e4639b8f4a7df87d9289147d69 WHIRLPOOL 062cf0812b696d78ada6b9a984701a47aa5d7745d5ee9122d0547b05e4a7402e0ce01fc07c5b9aa7c5e37bc668bc847088d7f66ff6ab9a14177efd297bab7062
+DIST calligra-l10n-ru-2.4.92.tar.bz2 580578 SHA256 35039195cf888006e82fefa4cbff2957364a9f261e5566cee24add59b462a3e3 SHA512 a8a25770d572fe8659b3d417e55212bff28fb662894aede69022477ce095f607b15082a599073bfd0596b25669fd2fda946028f6573b059bf6606344bf32be0b WHIRLPOOL dff25eb924a86fd73763e8fe1ecf15c325a6168ca54996fcb91bf06deb1855b2cdbfee1b37894557d68aacfb16035cc0aa9803a014fcd89db985a16ebeff981d
 DIST calligra-l10n-sk-2.4.2.tar.bz2 368330 SHA256 0667b38d459b4998c9eb1968e0807d809a73e77eda23fa5588ee128e5ad1f5e3 SHA512 2cc828189a91b4e8510ef68576368a95e673560547d1d658a67deb5aa2d0c0569716b87474d5e57b5db7fbd077b6f8d34ff3ae880ca2a0c78d9ae8ef8d3e9fa9 WHIRLPOOL 87c8e60cbfda578f855f01327f2972de58bab1344ab923e833d0bca2edf2f276eb730a8dbdbcd8113aee15397b82949f75420a4671aa0103a06c457812d1f841
 DIST calligra-l10n-sk-2.4.3.tar.bz2 368411 SHA256 ef89e2154fa3e787b5c4abeeef268e587be517ea896753bed52e570cbb4195ab SHA512 08e2cb147e944882d9d217a52dde2552be4aa1204b66b21e1006beaceb60b0a164bf382522daff8a54bd3bbae7ac86f06297cb85ba802bdef4215f438b02ced5 WHIRLPOOL 87a6c9c7319b9fa61cd63f538533ce7d0d164cbcb7d93ed9efebd0b3eedf97f1e529b99c7b4319dfe86e248066da2ce86507335b429d441b870b4075b4f92b41
 DIST calligra-l10n-sk-2.4.90.tar.bz2 359337 SHA256 31e6f85ea572a360a2b43c36e098e5b7ec7b2f114bedddb9a3c478766ad6922b SHA512 f28e57b67d4a781fb843f447b26f0c8ba098cd75c5c765c50344dfad73061f1b676681df7649a36f29b2d5215f065f9abe8e6c1522887990a1e1dfbcffc50a78 WHIRLPOOL 7886e13c28d3bce0bec8f794d663b830228c55ee7f2e69e4dbfd7e6e8919720a42057e6f347735497c121fa60bd6c4192241765fb517869e1f1413796be5543b
+DIST calligra-l10n-sk-2.4.92.tar.bz2 362195 SHA256 27b3b59697695167cd00448f35245dd0d63a84c3677e4467c5ea1baccdc72590 SHA512 376762973795349e0387b04e91ba0f28344037c127c9bacc72dde1f49c06e517c322964802cabac867962ab403180d4297b7d42b4491c375f7a8a1b4d292b22a WHIRLPOOL 868c1fcaadcdd456e468c56976e9febb6404c7b4624b9a949c4ee02040dffdf06e30c0a08cd14d627825782637acb83980fc2694986651c4e7592b67818e78c1
 DIST calligra-l10n-sv-2.4.2.tar.bz2 2047227 SHA256 064435b6e06171ae7c0988403f545fcbaf632d1f3d4304847906d3969b05dc58 SHA512 bd939a3442dfb8a03c1dcf96aa528f61f0101ae5208f9c392d2b2f424be24c25356a3e38342e9fb306f12abc96febd2aab2fdb2f2367dee955843e2cf4deadaa WHIRLPOOL 258ba0f1be45095ccb6224a0fff004aafea59a9787817b2cf5fa66df992443c18456122e664e7160ddffbd1463f45d69947c96ca4865ad7c66f3dbec07dc861d
 DIST calligra-l10n-sv-2.4.3.tar.bz2 2047214 SHA256 4ddbfce98dd6f0329267e232da5c47cbf6cc212dd66bf5e5fba5691d25141db4 SHA512 4baa4658405b8645c7dc9423e2ffcd1b03ee0440790f6e81850feb287f557e1fa6402e2b99de16a7c473dc8d253d97d710078a2325fb15e0ca7fbc3210f575f2 WHIRLPOOL 2ddbc001422fe81ee453755cff66d858668a456af0179a415c10907860ebd66e5a886a242165c9438937b3433da0fe5a31b9af6b308f77a70322d590301a1b2b
 DIST calligra-l10n-sv-2.4.90.tar.bz2 2043562 SHA256 23d5c3f01259c487f31d48b27afe43f1fb06d77aa2987264f7384e29f973723e SHA512 8931a9428160db13ec6c86bf3cc9c63f85a16757447b326e2339dd85617f9a1948d931c715a39bf7f16883b803ab524f43a4c8845a8e21faf74d4b89777716dd WHIRLPOOL 0eacbd467f5d77643abb1920c74a0c23e911f8827120f315576150574fa39d4c1339ff2e2773ada7c3d0a6f102437c508c0846609c467092a9d7b483ae5e302c
+DIST calligra-l10n-sv-2.4.92.tar.bz2 2032229 SHA256 d3b332c752f9e53273fd99c77750da2bc7688b7854404e2f69d5217dd3dc7861 SHA512 472c73ee9ca3705185e66842ae538fa1807bbe3088ee724a0ab315ff5c0ccf7fdb13e4cc409f881d19b5fadbdbbe00757de9f1a03dc030a768644ab64f7e45aa WHIRLPOOL d5ade69583b5e6eb97ed8dd94ed2b52825ea062b33d62d7b9ba125ebd5c4612d2862bf0bcfad5fbf05cf3ce2412e66af3b7f331ec65e86cf2763a1478f8df67f
 DIST calligra-l10n-uk-2.4.2.tar.bz2 2126141 SHA256 2a0124159d0ca3b0ca5806180659c3deb1d3b044cdfffabc2994df93de3989b9 SHA512 76d11407b428882152dd5260378fab49ee1f0eb1e31fb24233f136d4120c757d746fdcdd71c93e832044215ac642f78bdf2da4c980da9e73348c3efa161274dc WHIRLPOOL 43f1f29a140b9bfae0673475dd34e95ddd328bb451221014094294727e759d984e364c4b4b163f864863c9c0f777803f3c98c553857530e1854a1bc12d4d00fe
 DIST calligra-l10n-uk-2.4.3.tar.bz2 2125959 SHA256 700e9f9fda44cbb2b2dadc55f9170c945d4c4b3f4219738ee133928f594eddbb SHA512 f2dbd834b31ebaf6c4d6190a684b74c3b998f6d135dc64ab340fd995d62ceac0f9bf17ee88dfa7258ca3ac5e670c783c6f0ccefea8d590d151ee14a68e7ed2e2 WHIRLPOOL 3f09910de1bb03dbdd0ba616aa0905a7b3c4704bec11a68b918309caef45ebb8626bbc23dec7c637cabaf1242311444f8dc69464f8853c767b05cb1899ed1955
 DIST calligra-l10n-uk-2.4.90.tar.bz2 2122732 SHA256 8e4d5980140f49c64a4147ec1c93c7089671d1194aaf1de31b8b33ffe9c8fd99 SHA512 9616e62bf70dd3e3a0aa3030840e8586eec1e1f505c5e61d4c67cafb6dd06cce133034b7466354c4aa680625f356ac02fb27007d8e54e35236167cf8cb2d9a6e WHIRLPOOL 9b07cc6503cbf97b4829f023b70a2f240b4e34116e6343c748084c9091edcd040a55ae6f2f00a8ff85729ed6906a0f65f5590d3dd1826a074f31bca697fd57be
+DIST calligra-l10n-uk-2.4.92.tar.bz2 2119912 SHA256 79a55c26d637c603165be7236a1cfb5517388e89f3d7cc21746355f300552af4 SHA512 37c38e1de30b84e099ff5d902264038635e935bf7d9de5457f2fe635130604a2933d9e19bb2762c83a4c0a9c35aa104a366360d1b1f555856105f1932fadbf9b WHIRLPOOL b2a5add74ef8d434fa1b406ae108f3892bc426304a940c3f4d861d9f379a45a0497da0e8bd678ab740e26ec76261bdd891aa2ff5a51dd6cc752711efe2d2adb3
 DIST calligra-l10n-zh_CN-2.4.2.tar.bz2 346242 SHA256 1631ffddf8538b1a70033f774713f43cd6bbd4ee5eecf3f5d2a1c634b0813d84 SHA512 d5e1a9bc25b4cd72fedef09587eb3e788bddd7fa100e5eca86cbb7fad78780e78ad3c65c7ce2cbb1728eb04795d58c72f332ff69afbf5621713d181a2b464a15 WHIRLPOOL 24739b5c6984692143ab37c8fc6e641bd2e484d423565d08de112f8277994d742c0bee796d7d308d9e8eab14fb6da986f2150134bd86d659b285236d110c204e
 DIST calligra-l10n-zh_CN-2.4.3.tar.bz2 346269 SHA256 49cce084396baf0e619230f4990edb39d8e08c8ab6acd7a8e7e5a510eaa80cb7 SHA512 940086ac0dd548626d96e9fb3f9bd022cd107dbe3af88246eae099c803c66f621329f2e99388c7c1420a866363c94ea111ff7d61ad8eef4d5b3b6c9b5e7f5aff WHIRLPOOL e4900a5594eac24c18e10fc9f39ff66d210fca65424b2e4c66b675caddf005885c951cba7769e5337035397fac884f658fc56b6885a2ceb92afac87f5a1129a5
 DIST calligra-l10n-zh_CN-2.4.90.tar.bz2 343139 SHA256 97f5a8754d30631fd1cd7dfd64c9fb9d24accac108e84ee542b898a69ad824be SHA512 3ade3765b142aa52cce5fb6159e831149dfd305be5932dcb8656614f14a5016e5e514c1b06d247cf20d2d9ad825d04b1df40caac8b5e73b3314b31c30a1aea88 WHIRLPOOL 84aee1eb187353f3ecc79b4e98f3378ac8b927b5ebd8d04a8bfd82b48baacae466fd312b82373f3fa5d5dfb1e3efde5d3e5dbf741d960ca2ef81393791badbeb
+DIST calligra-l10n-zh_CN-2.4.92.tar.bz2 345507 SHA256 7b2e79aacee37dce37571ad0bc22c861a641344c5438d3a4df0ee84193d8506a SHA512 3941a2c7d578482c09d1a05f76e69021479823c3ce38d1f67e8fce981d0b20b17fcd822e0d3e462f79edc1017505c002b9e8cbd6f274412477ab4211e9022af0 WHIRLPOOL 76ff72805e726165c65c8fb52e38b06775a479267d223f022e0c7c6ab1d60386230eedfa352e0278958b7a6412de775e3f38acc17906e5e447305f34da1dba0d
 DIST calligra-l10n-zh_TW-2.4.2.tar.bz2 386400 SHA256 294d50e1398e94f36b045c7ec21ac2ef63950e3ccc67864e50bca39b4216d4e1 SHA512 9713631390af4435694bf98ee6ff86aac850adb710caf505a24642827129f88b4394f48dab3328561d587780028abb0a1577174698a914792e04397473bf4ca8 WHIRLPOOL d8e9e753902b2d382a8a10cbb1bfccb223d834856f3bfab44a094629b239740ab3f947c42778b0f7652fa15c6997e214326e5d41d14a6743c079a23dc32f12ef
 DIST calligra-l10n-zh_TW-2.4.3.tar.bz2 386371 SHA256 9bd8d7cfdf23d6b2b3b58a2d044a9a4c0d678286a1d47c631af2b067f06ddfc0 SHA512 d85f4c0256c0d1641448e30465d194604586413cd25e55034969ef9be11ae94f2b24f4fdcb03a94927fcee5916ef69f43364f42544cde372110add26ea3c3765 WHIRLPOOL ba86ef5f6260b3cf7ee190c6915eec6a214dc8494176842fd5746ffce66366bf3a5f65b4ad7b75d5c4bf52ef79192f1155a1904207b771f5c95a5833f892a3bb
 DIST calligra-l10n-zh_TW-2.4.90.tar.bz2 382931 SHA256 27c999d53d964e420068d79171e90054e6621eff435c9b0f912a190e9d6b3788 SHA512 969b6209cbd6412a8ff4c61b013f60065128ca9cc5525ee42626ac43f76be95ef2968a39cf8b1c5e2b708be96291b675dda9e68bbe94d9424102a7a6207a5a90 WHIRLPOOL 845ea7ca5d9cd720c1fbfa7c962ed562583ea3ba55be02fddb0d61fafd710a9626dc5896f48c24ec53176474b6b729ad307b1fe4fd08c36e9b7e5fd2895322da
+DIST calligra-l10n-zh_TW-2.4.92.tar.bz2 384989 SHA256 f2aa20ab8399d5e7ff0612e8ce32f7504c4bf6024253fde24b84555c916c4ce4 SHA512 f98c88b1373bf28d3c5891b3f21ea3f11f6fb3e67c5f59f722c117a7514760ab6b98d51f9df9136e721a11ca0f7f1dcb3add1aa1c20084b260bcb2d9fc9fdbc9 WHIRLPOOL 60a258fdb033149e529ac22b83acf8166a9470b41a015e7980650f0d6c9afefc3e0e46218d48fd131182a6732966372349604b93f0da8245128a5ea7442cefed
--- a/app-office/calligra-l10n/calligra-l10n-2.4.92.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.92.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.92.ebuild,v 1.1 2012/07/20 21:24:47 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Calligra localization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="sys-devel/gettext"
+RDEPEND="!app-office/koffice-l10n"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+MY_LANGS="ca ca@valencia da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
+URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
+SRC_URI=""
+SLOT="4"
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
+done
+unset MY_LANG
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local lng dir
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for lng in ${MY_LANGS}; do
+			dir="${PN}-${lng}-${PV}"
+			if [[ -d "${dir}" ]] ; then
+				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
+		$(cmake-utils_use_build doc)
+	)
+	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
+}
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@ -1,3 +1,4 @@
 DIST calligra-2.4.2.tar.bz2 119318136 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193 SHA512 a9a8fbeeb3269c4aa0e02479a6fe4c384bd38ae47b49a68b241a527ca36e1984e8dbc94953b809f30cfd58f51d5f0b9a1cc262d2a8ba1c45d72ed47c10e880b1 WHIRLPOOL 12a06a3cfae6db3c29766a38d6071e9f91793814286d2dbe620151c452beeef060c8ffb131347afb873115d926aa993ab50dbb4f0fbb1ec9ed6ca66dfe4a2243
 DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6c3b38ec8f302e6131a21be8c5946a SHA512 7c8ab608a43d2f386086d4966462521c22d648e5e6f5d11cc88093c8d40d21b3c81d77f0b01ec3781c849560138c7c3d026c017c3653400c92ad8314d1615827 WHIRLPOOL fe5259c0ff220a9020647f686de5afecb7a9c0a2929259435d7f9b7c461a0da3c338d39fbd5bb7dcd53a0f79bab6ac312d68d46c241adab7916a89d86e869974
 DIST calligra-2.4.91.tar.bz2 119280417 SHA256 720fdae969102744677b633bae81d31488f8b49d4cfba89ca848faef5764a8a9 SHA512 6f9ea68ccbd96368bb29c12f10717dcabe5bff7f7f379c9735e62d9b53c2da469a11fe569a2819410a3137acd70d91e97a1c5f7fb239dcc182fc8b3f2de009b3 WHIRLPOOL 66e4e90c025e23065e9366c8b4b983d3c318d32d7d0a61a1c5b74937b2f08982858b7ddd10bd8e46612ec6b664d6e79a246877332c91fe7670da260c7d7e37cd
+DIST calligra-2.4.92.tar.bz2 119204963 SHA256 8842f9353b13ddc9a5e5f86bee7ea57426adaea5e7ccffd8919bbae51b10d421 SHA512 75a3173f8d2a34888cc32d8e6e987e78011a33ba93fd177c3d25aa99d75e4a3cffa9cf6372f7ef45f20658ab30663d0adfcfd2d63e347c27aab2f2aab3f05420 WHIRLPOOL 623e4a1a8b19d58af205202d8bd606698e0df0188bedd301c18ed8f5f463b0882689bdc49aea61cd613789cd03e6bdd2a86a8d0b4916a0a8eba05bf9d00ba229
--- a/app-office/calligra/calligra-2.4.92.ebuild
+++ b/app-office/calligra/calligra-2.4.92.ebuild
@ -0,0 +1,221 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.92.ebuild,v 1.1 2012/07/20 21:23:34 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+	2.[456789].[789]?)
+		# beta or rc releases
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
+	2.[456789].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_sheets? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=x11-libs/qt-gui-4.8.1-r1:4
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with opengtl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}
--- a/app-office/rabbit/Manifest
+++ b/app-office/rabbit/Manifest
@ -1,2 +1,3 @@
 DIST rabbit-0.9.2.tar.gz 6088701 SHA256 17f5a195ff85453733c8d67f5ad8af794f446081c1729efb2b5f76f033b3c9e7 SHA512 5dda23a223d0f124c08a69a803961934d7ac16e8059811bab005e2c6b485a0f5e68a552dbd6b276c8b09dbbb0b74ae7e93b0e2874e0ffa86c977642633fc3733 WHIRLPOOL 5d9c343ab2ff10b9911b7c9d2b45e40ad205ed01e8de7f81e295b75b8f9752e5efc38b7b3147d9892577aaf4456b695bcf3ce3fb361a6b45ae6afcadd5243b83
 DIST rabbit-1.0.6.tar.gz 5886935 SHA256 2413dd3679c4782204f45f19e98ed2f3d8e063a1e79f9d40fd36f56355382576 SHA512 dfcdfa1aa8f3bd8b8b1a61133a98540f5affefced3568b282d36e3c8095572628c53f0efbc8e9228d9e3f38c75a26b49a54cac9ea0f7a3d88cf13d8891d019c2 WHIRLPOOL cbae12d247b5aa239eac12f009b1b18618339b46afa0a09fa40eb6f181be73e8e8302ad0a003074eb79896a49eb24af8299f95af24c5d198e6998e77a8129c39
+DIST rabbit-1.0.8.tar.gz 5895785 SHA256 9a5c36f5709da16d6be379b3329d886f0853cc8b756a681391566957b54049cb SHA512 eebb99ecdcf10149fc61ddf8195b8b8250e0a012c4ec45d17814c529e869414fe2a22a0f7019ee9fe6fa1ec6fe0ceb0cf2a5c2a9aab91fd2809af374868f40f9 WHIRLPOOL aeab6136e8f3d8e08df5deeec032ae42f52ca3dfadf84b5101c111f31f24508bd8ec331405edd82607818579ce1ec1f059c671a4a247fc47d2d0c34b746ff5a5
--- a/app-office/rabbit/rabbit-1.0.8.ebuild
+++ b/app-office/rabbit/rabbit-1.0.8.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/rabbit/rabbit-1.0.8.ebuild,v 1.2 2012/07/21 07:31:22 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18"
+
+inherit ruby-ng elisp-common eutils
+
+DESCRIPTION="An application to do presentation with RD document"
+HOMEPAGE="http://rabbit-shockers.org/"
+SRC_URI="http://rabbit-shockers.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nls migemo tgif enscript emacs markdown postscript"
+
+CDEPEND="emacs? ( virtual/emacs )"
+DEPEND="${DEPEND} ${CDEPEND}"
+RDEPEND="${RDEPEND} ${CDEPEND}
+	nls? ( dev-ruby/ruby-gettext )
+	postscript? ( app-text/ghostscript-gpl )
+	migemo? ( app-text/migemo )
+	enscript? ( app-text/enscript )
+	tgif? ( media-gfx/tgif )"
+
+ruby_add_bdepend "emacs? ( dev-ruby/rdtool[emacs] )"
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.0.0
+	>=dev-ruby/ruby-gdkpixbuf2-0.15.0
+	dev-ruby/ruby-gtk2
+	dev-ruby/ruby-poppler
+	>=dev-ruby/ruby-rsvg-1.0.3
+	dev-ruby/rdtool[emacs?]
+	dev-ruby/haml
+	markdown? ( dev-ruby/kramdown )
+	dev-ruby/sinatra
+	enscript? ( dev-ruby/nokogiri )
+	emacs? ( dev-ruby/nokogiri ) "
+
+each_ruby_configure() {
+	${RUBY} setup.rb config --prefix=/usr || die
+	${RUBY} setup.rb setup || die
+}
+
+all_ruby_compile() {
+	if use emacs; then
+		cd "${S}/misc/emacs"
+		elisp-compile rabbit-mode.el
+	fi
+}
+
+each_ruby_install() {
+	${RUBY} setup.rb install --prefix="${D}"
+}
+
+all_ruby_install() {
+	dodoc -r doc
+
+	insinto /usr/share/doc/${PF}
+	doins -r sample
+
+	if use emacs; then
+		cd "${S}/misc/emacs"
+		elisp-install rabbit-mode rabbit-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50rabbit-mode-gentoo.el"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/app-portage/flaggie/flaggie-0.2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.ebuild,v 1.4 2012/02/09 23:24:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.ebuild,v 1.5 2012/07/20 14:39:00 jer Exp $

 EAPI=4
 PYTHON_DEPEND="2:2.6"
@ -15,7 +15,7 @@ SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=sys-apps/portage-2.1.8.3"
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,3 +1,3 @@
 DIST calibre-0.8.52.tar.xz 24690364 SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a SHA512 9fb6bb085b8f42a0ad3f63141ce2de63cc7e7c0d5ed914904ddd05fac3713c4c47f093e4579ceab7080627585167e7312039cbc8bc2a1e969937553e123d072a WHIRLPOOL 569be4afc50c78bb4bb35f5d61201760c8ea5fa25d6bcafb343dd6cdfc4a5fc2ff4175549438a9473302331c982f4cfc1d0a916ff2ac3593072f4154142966e2
-DIST calibre-0.8.59.tar.xz 25001852 SHA256 cdab81f39cf558bf09b16eb3327b33e7edb958395f9180172e08f9879deeb7af SHA512 8f59b9eb68bde65efa2ec7f9045e7ca12a21db603dda4ddc7f5dc01ab7ec0e213d2137bcc9c899e31c895edb793603fa920a00747ad20a811cf0bfd43438045e WHIRLPOOL 2ed37c682752b281286f37a310019cad354030189b9f35349c2f7d4d35cf32235e5ebd4fcf70663705c845ea906844ea205b5de88244453c7ec3a18a92a9355a
 DIST calibre-0.8.60.tar.xz 25020596 SHA256 5f5a80ca2f6e9523f3911067090f7d1d9befc62ee90095e6188302c387646df1 SHA512 78267f30a1aa89edba17a5b27868b151b0b853f173b9ff01d5e0e8d78d20cae623120eac5418a3733bb768c9e6e835a3467f96a3d42e4b44e62bc188b7bfcf03 WHIRLPOOL 5001a766a6ebd7fdfcb3983049214a922d08b32498133ad4540efc1276d63e3853405eedf5b4f2e7075814f720c6a724742015792ec6497bbcee277b271632de
+DIST calibre-0.8.61.tar.xz 25077408 SHA256 fbbf54d952a13939557b57c5e13d673ed24b5b395fc550c2842d0bca49d3f380 SHA512 f3d588d58e44b2dd5954c96380aaf4bdb4d80605ace32829771002baa26d89485a7fb9f53266edb1cc63a5b561949a7f1b7e7245938bb8c59d581519f0e63e49 WHIRLPOOL 04794a183e8df53d2b4e86f2d0353953754a04e3ddd53add2b2738b093e24fa49a7a4e89341a16c4fdde0be13a5d13ee56b468d9b52e9e0cc7b86217c080bb9f
--- a/app-text/calibre/calibre-0.8.61.ebuild
+++ b/app-text/calibre/calibre-0.8.61.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.59.ebuild,v 1.1 2012/07/06 23:31:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.61.ebuild,v 1.1 2012/07/20 20:00:17 zmedico Exp $

 EAPI=4
 PYTHON_DEPEND=2:2.7
@ -63,12 +63,13 @@ src_prepare() {

 	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
 	# calls xdg-* (bug #258938).
-	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
-		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
 		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
 		-e "s|PreserveMIMEDefaults():||" \
-		-e "s:xdg-icon-resource install:\\0 --mode user:" \
-		-e "s:xdg-mime install:\\0 --mode user:" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|xdg-mime install|\\0 --mode user|" \
 		-i src/calibre/linux.py || die "sed failed to patch linux.py"

 	# Disable unnecessary privilege dropping for bug #287067.
--- a/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild
+++ b/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfshuffler/pdfshuffler-0.5.1.ebuild,v 1.4 2012/02/29 23:54:20 marienz Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils fdo-mime gnome2-utils
-
-DESCRIPTION="PDF-Shuffler is GUI app that can merge or split pdfs and rotate, crop and rearrange their pages."
-HOMEPAGE="http://sourceforge.net/projects/pdfshuffler/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyPdf
-	<=dev-python/python-poppler-0.12.1-r2"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog README TODO AUTHORS"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
--- a/dev-dotnet/ikvm-bin/Manifest
+++ b/dev-dotnet/ikvm-bin/Manifest
@ -1 +1,2 @@
 DIST ikvmbin-0.46.0.2.zip 15683101 SHA256 6694698b03910282eae1bbdfccd935f7f90396cad17a657c4734f66fc1e69f13 SHA512 6831c5aa69ec7ec7b60697c436404a79b3985f6732908d6da990132e44a13f6823ce2d69b41f3e742bfac8c9b0bdd002e24b47d2125919d6cbd59e45ddcd37d9 WHIRLPOOL f600b934dcd98ea751f6c2511e1720143cbcd02ffaebf0fb1a2026724212f361125544cd18f30bfb824d14d972b8df64a7ef8089cd7d7372cf706420cf1a8480
+DIST ikvmbin-7.1.4532.2.zip 16391340 SHA256 f28f6ae9bd58bf8ed3f23ab2cb4003676ca8c036e063f3641957386f4aa24572 SHA512 a447473741541e13b6723feef7f474a01670d885ffbfd68269b121cfb39658ca0189f30e055b811f7c72e320b7a28e115b2b858679c43b55b86f00a1429ecdae WHIRLPOOL 0fee6104d1d3f9e9446bd33186bb92801f2d7483db4b3c1ed7bac5dc3274f4062a3f06b007fea21de4cee50c62be0b5c6ed40d525a6e145bc8eb833dd760f6c2
--- a/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild,v 1.1 2012/07/21 09:23:25 pacho Exp $
+
+EAPI="4"
+
+inherit eutils mono multilib
+
+MY_P=${P/-bin/}
+MY_PN=${PN/-bin/}
+
+DESCRIPTION="Java VM for .NET"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/${MY_PN}bin-${PV}.zip"
+LICENSE="as-is"
+
+SLOT="0"
+S=${WORKDIR}/${MY_P}
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/mono-1.1
+		!dev-dotnet/ikvm
+		app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${MY_PN}
+	doins bin/*
+
+	for exe in ikvm ikvmc ikvmstub;
+	do
+		make_wrapper ${exe} "mono /usr/$(get_libdir)/${MY_PN}/${exe}.exe" || die
+	done
+
+	dodir /usr/$(get_libdir)/pkgconfig
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		"${FILESDIR}"/ikvm-0.36.0.5.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${MY_PN}.pc \
+		|| die "sed failed"
+
+	for dll in bin/IKVM*.dll
+	do
+		dllbase=${dll##*/}
+		ebegin "Installing and registering ${dllbase}"
+		gacutil -i bin/${dllbase} -root "${D}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) -package IKVM &>/dev/null
+		eend $? || die "Failed installing ${dllbase}"
+	done
+}
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@ -1,3 +1,5 @@
 DIST ikvmsrc-0.46.0.1.zip 1870376 SHA256 901e8b990cf6d0fc9f8a18179e040cdba8a2fa00ac5658eded5c9ea4665f6423 SHA512 83c0dbaf0ea229fb8046d0f6016bfe1990c88639fd5d162afea3330441ec627edcb93de903e5fa3d73062c917574441bac832c2d61144626e70b3324dfdbf9f4 WHIRLPOOL ee837a2d9c038ec2fdfec93ed2cd0ec162bf4e081b8a0f0fe8b9bab62eada13f72cf8a8c5a8c83600b415d89dd5b0a539056e169ea79d8eb885298ddf91e3533
 DIST ikvmsrc-0.46.0.2.zip 1873662 SHA256 25afda0b29a2562ffb8f0a457204bde1008c8d255abaf45c3a09b13f7eba5f06 SHA512 79976ef9f90a691a607740d4efd338ed8ee86061298ebf3a5b3c660bed779e54bb7fe80548fc1eed78ce35fbdcccb460b656960a2c464377fcfcb98c2c6ed12b WHIRLPOOL 5c7f6c800c5b4670fb9e9a45161059233edf06b0440e7428217b03f400f29a46a0b0fd253bbc5d608ab5be7d0edac78b98efe6dbf219b72e960d5d51731b6a26
+DIST ikvmsrc-7.1.4532.2.zip 2102200 SHA256 3f22b9171b56a7600f28c42828898772bcd37c996d15b219c1b9ba08aa4c12e0 SHA512 889e23ce9cdc9abff98c54e5e02b9798ab908c37ecb6b8b0733d7b6e8e813c939ab91daa6ae57a0abd4fa90365c395231de5c9596fd77bdf1b15505c6b46abb1 WHIRLPOOL 5cf5e210b21b2697a489b0d6d40321d9f4cf89e92b2d280fa6686583836821d3bb613ce9af1bbde772fda5a0373dac20f7a09f4852d5c59ecef2bd65bce82235
+DIST openjdk-7u4-stripped.zip 55617337 SHA256 d85b89b452ecdb46309ec39b28e283813660bb8b8399d4c222d3ff1a83b971f9 SHA512 3f4d32994c9a078b68ae6da13770c249561240a01840f88094e139b0297b25e37a2acd3ef74fa14a830be5aa43c693b3ecf1c745dbc7051c4b2e1816c397e9a1 WHIRLPOOL b7690de8c31acb4b3a62fdd132bcf33b2264559e64a116d75fed3a3edeb570345ade582377d2d824d2ab5831a0865b5b1c51f7a514285935696be3cef5079b1b
 DIST openjdk6-b22-stripped.zip 51279392 SHA256 32af924f320118b242c1bce4828abbe4c11120dd144c012ce2f5d88b75d2f568 SHA512 e0cd896c80e3b10aaa1b1128ea63b062c7de0539188d66f2ae081d420c6f467b1aa8fdbc5fe4cb366c89ed2880560b287e9af5e8312d36903a46f23d1bbbe791 WHIRLPOOL 7d86ea0693e371273ea160ba20daafe7b8d9453687a3e21f81ef239f4186cafcc367950a1117a14da21b212831baebfab9a03f87166f7cd6a598811cc73e3a10
--- a/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
+++ b/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
@ -0,0 +1,61 @@
+Author: Jo Shields
+Description: This patch ensures that rather than trying to use the Mono Crypto
+Description: Service Provider to retrieve a signing key (CSP is not safe to
+Description: run with fakeroot), we simply hard-code the path to a bundled key
+Description: file
+Index: ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:29:25.080047165 +0000
+++ ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:30:58.092593303 +0000
+@@ -33,5 +33,6 @@
+ 
+ #if SIGNCODE
+ 	#pragma warning disable 1699
+-	[assembly: AssemblyKeyName("ikvm-key")]
+	[assembly: AssemblyDelaySign(false)]
+	[assembly: AssemblyKeyFile("../../debian/mono.snk")]
+ #endif
+Index: ikvm/ikvm-7.0.4335.0/ikvm.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:29:57.152235493 +0000
+++ ikvm/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:30:48.348536094 +0000
+@@ -6,8 +6,8 @@
+     </target>
+     <target name="signed">
+          <property name="signed" value="SIGNCODE" />
+-         <property name="signoption" value="-key:ikvm-key" />
+-         <property name="ilasm_signoption" value="/key:@ikvm-key" />
+         <property name="signoption" value="-keyfile:../../debian/mono.snk" />
+         <property name="ilasm_signoption" value="/key:../../debian/mono.snk" />
+          <call target="managed" />
+     </target>
+     <target name="managed" depends="clean-managed CommonAssemblyInfo">
+Index: ikvm/ikvm-7.0.4335.0/runtime/runtime.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:20.084722420 +0000
+++ ikvm/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:47.120881144 +0000
+@@ -19,8 +19,8 @@
+ 
+     <target name="signed">
+         <property name="signed" value="SIGNCODE" />
+-        <property name="signoption" value="-key:ikvm-key" />
+-        <property name="ilasm_signoption" value="/key:@ikvm-key" />
+        <property name="signoption" value="-keyfile:../../../debian/mono.snk" />
+        <property name="ilasm_signoption" value="/key:../../../debian/mono.snk" />
+         <call target="full" />
+     </target>
+ 
+Index: ikvm/ikvm-7.0.4335.0/tools/pubkey.cs
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:30.479726527 +0000
+++ ikvm/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:58.927893592 +0000
+@@ -29,7 +29,8 @@
+ 
+ #if SIGNCODE
+     #pragma warning disable 1699
+-    [assembly: AssemblyKeyName("ikvm-key")]
+    [assembly: AssemblyDelaySign(false)]
+    [assembly: AssemblyKeyFile("../../debian/mono.snk")]
+ #endif
+ 
+ class PublicKey
--- a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.1 2012/07/21 10:12:48 pacho Exp $
+
+EAPI="4"
+
+inherit eutils mono multilib java-pkg-2
+
+DESCRIPTION="Java VM for .NET"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip
+	http://www.frijters.net/${PN}src-${PV}.zip"
+LICENSE="as-is"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-2
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	!dev-dotnet/ikvm-bin
+	>=dev-dotnet/nant-0.85
+	virtual/jdk:1.7
+	app-arch/unzip
+	virtual/pkgconfig
+	app-arch/sharutils"
+
+src_prepare() {
+	# We cannot rely on Mono Crypto Service Provider as it doesn't work inside
+	# sandbox, we simply hard-code the path to a bundled key like Debian does.
+	epatch "${FILESDIR}"/${PN}-7.1.4532.2-key.patch
+	mkdir -p ../debian/ || die
+	uudecode < "${FILESDIR}"/mono.snk.uu -o ../debian/mono.snk || die
+
+	# Ensures that we use Mono's bundled copy of SharpZipLib instead of relying
+	# on ikvm-bin one
+	sed -i -e 's:../bin/ICSharpCode.SharpZipLib.dll:ICSharpCode.SharpZipLib.dll:' \
+		ikvmc/ikvmc.build ikvmstub/ikvmstub.build || die
+
+	sed -i -e 's:pkg-config --cflags:pkg-config --cflags --libs:' \
+		native/native.build || die
+
+	mkdir -p "${T}"/home/test
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-2.0 signed || die "ikvm build failed"
+}
+
+generate_pkgconfig() {
+	ebegin "Generating .pc file"
+	local dll LSTRING="Libs:"
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	cat <<- EOF -> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+		prefix=/usr
+		exec_prefix=\${prefix}
+		libdir=\${prefix}/$(get_libdir)
+		Name: IKVM.NET
+		Description: An implementation of Java for Mono and the Microsoft .NET Framework.
+		Version: ${PV}
+	EOF
+	for dll in "${S}"/bin/IKVM.*.dll
+	do
+		LSTRING="${LSTRING} -r:"'${libdir}'"/mono/IKVM/${dll##*/}"
+	done
+	printf "${LSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+	PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --silence-errors --libs ikvm &> /dev/null
+	eend $?
+}
+
+src_install() {
+	local dll dllbase exe
+	insinto /usr/$(get_libdir)/${PN}
+	doins bin/*.exe
+
+	dodir /bin
+	for exe in bin/*.exe
+	do
+		exebase=${exe##*/}
+		ebegin "Generating wrapper for ${exebase} -> ${exebase%.exe}"
+		make_wrapper ${exebase%.exe} "mono /usr/$(get_libdir)/${PN}/${exebase}"
+		eend $? || die "Failed generating wrapper for ${exebase}"
+	done
+
+	generate_pkgconfig || die "generating .pc failed"
+
+	for dll in bin/IKVM.*.dll
+	do
+		dllbase=${dll##*/}
+		ebegin "Installing and registering ${dllbase}"
+		gacutil -i bin/${dllbase} -root "${D}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) -package IKVM &>/dev/null
+		eend $? || die "Failed installing ${dllbase}"
+	done
+}
--- a/dev-java/tomcat-native/tomcat-native-1.1.24.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.24.ebuild,v 1.1 2012/06/14 16:13:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.24.ebuild,v 1.2 2012/07/21 09:15:29 jdhore Exp $

 EAPI="2"

@ -11,7 +11,7 @@ DESCRIPTION="Native APR library for Tomcat"
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 LICENSE="Apache-2.0"
 IUSE=""

--- a/dev-lang/ispc/files/ispc-1.3.0-gcc-4.7.patch
+++ b/dev-lang/ispc/files/ispc-1.3.0-gcc-4.7.patch
@ -0,0 +1,35 @@
+diff -Naur ispc-ispc-c6ec130.orig/ispc.cpp ispc-ispc-c6ec130/ispc.cpp
+--- ispc-ispc-c6ec130.orig/ispc.cpp	2012-06-29 09:38:38.000000000 -0600
+++ ispc-ispc-c6ec130/ispc.cpp	2012-07-20 13:24:38.000000000 -0600
+@@ -40,6 +40,7 @@
+ #include "util.h"
+ #include "llvmutil.h"
+ #include <stdio.h>
+#include <unistd.h>
+ #ifdef ISPC_IS_WINDOWS
+ #include <windows.h>
+ #include <direct.h>
+diff -Naur ispc-ispc-c6ec130.orig/lex.ll ispc-ispc-c6ec130/lex.ll
+--- ispc-ispc-c6ec130.orig/lex.ll	2012-06-29 09:38:38.000000000 -0600
+++ ispc-ispc-c6ec130/lex.ll	2012-07-20 13:37:15.000000000 -0600
+@@ -41,6 +41,7 @@
+ #include "parse.hh"
+ #include <stdlib.h>
+ #include <stdint.h>
+#include <unistd.h>
+ 
+ static uint64_t lParseBinary(const char *ptr, SourcePos pos, char **endPtr);
+ static int lParseInteger(bool dotdotdot);
+diff -Naur ispc-ispc-c6ec130.orig/main.cpp ispc-ispc-c6ec130/main.cpp
+--- ispc-ispc-c6ec130.orig/main.cpp	2012-06-29 09:38:38.000000000 -0600
+++ ispc-ispc-c6ec130/main.cpp	2012-07-20 13:25:18.000000000 -0600
+@@ -41,6 +41,9 @@
+ #include "type.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+ #ifdef ISPC_IS_WINDOWS
+   #include <time.h>
+ #endif // ISPC_IS_WINDOWS
--- a/dev-lang/ispc/ispc-1.3.0.ebuild
+++ b/dev-lang/ispc/ispc-1.3.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.3.0.ebuild,v 1.1 2012/07/07 00:48:30 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.3.0.ebuild,v 1.2 2012/07/20 19:58:21 ottxor Exp $

 EAPI=4

-inherit toolchain-funcs
+inherit base toolchain-funcs

 DESCRIPTION="Intel SPMD Program Compiler"
 HOMEPAGE="http://ispc.github.com/"
@ -34,7 +34,7 @@ DEPEND="
 	sys-devel/flex
 	"

-DOCS=( README.rst )
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )

 src_compile() {
 	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
@ -42,6 +42,7 @@ src_compile() {

 src_install() {
 	dobin ispc
+	dodoc README.rst

 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,11 +1,14 @@
 DIST php-5.3.13.tar.bz2 11396389 SHA256 ef1a7235b16be449f31f73f60d5770a133b863d225d65a218546cfb7d031d99b SHA512 230ae89ee8bcb7bf0aa9b05adb62641f14de7db1d9421ed84e4f6ae47ace7e93ed67f2925b2727ee447c1d9191ef9ff94980a5af9e177681f3cf0c08e1ceb405 WHIRLPOOL a5406bf4f3e39ce7d7d610e384f7dbd3157eab65af3700a7eb9788f8fe5aab77d8ccf07f0e723f2d32f86e7ea33c4191b849a0cac59b2242cc01be5df80f566e
 DIST php-5.3.14.tar.bz2 11408016 SHA256 c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3 SHA512 3de478d4b69aa8dc085c7bc13cb84cd9e17322737cfadc1801dd8f0d33ca2855ca363825f4057a394d2adfa5910bad7af017e44d7ab18f66388651055b16d885 WHIRLPOOL 2128f79235e6a08e169c5ad06a9ed6e593e9b1ac212a0fa654daa82a1d59309b51a4384369fd1a3e254d9803557cd904083e2ef5bcbcdcff5f05af71bb35bf38
 DIST php-5.3.14RC2.tar.bz2 11399796 SHA256 10707d4627c5e1305eaa869fa06cf8caca2a2cd4805c28fe039df9df1ce3316b SHA512 5b540695d3cd07016396d3ec1c5d3343cd9976d66a61869fbacb73bff237a739873204017666419139a65ee5d3aa8ef4ae1797b075ea6345d499323158dae44f WHIRLPOOL d65807a1bbfd0dc9a3019781d73dd9106aeaa6b9a33065072a8e0aa7fe57cf8580bd78ab3ed179bb2bc934d0bb23bc27fd02c3d3ac90c09dae27bde1577d42d0
+DIST php-5.3.15.tar.bz2 11307865 SHA256 f9b725659e64228a60883bd134afe1f638900b6b8fa93ba98053095b0892f1ef SHA512 40334a3c7957637506d265fc9c534a8e35dabd83683d30094f1b48b69e4b20a40715d0b4ad98fb8467e91f74f878fb148b910e7d0a5df22ee3e601b4228c8180 WHIRLPOOL 7b8fee9c90a9af88d95b5ee7877081b0030cee0ccc2d431ddb97c3bd857624c1124aa2109b709334387e4b073ce3bbf3297bd13c1d805791fb41cb226faac0df
 DIST php-5.4.3.tar.bz2 11147567 SHA256 d7e0c987586b6554ee08e3b71cc2806ddd1b192451159083d861c132994bc1bd SHA512 a7ac33d581b6baf37680518b38c5fdf6172db2c599d14b4b3893ce81aa956bad3cd093046fd78017c731cad6c3fe42de42af4348df316dbc7c041099a23e1eef WHIRLPOOL 41e175f0f7b40b659d2b0d49428c46856158d2d189da62e5e8ab3a7cfb594b784a0f547795c2962386e9c14172092d5dd89f993ffc31372fa446f5f247d9f72f
 DIST php-5.4.4.tar.bz2 11150967 SHA256 70b0e604077058791a311121e96d792210685dffbb329d2042084637435cc666 SHA512 f297203c75ca10dc98b19f1b923d6549da8b56df227b5bf409e9d21f8e19ea858f6681d842730a6643047eb34c44ddaf4414d319d9474296f0fd575ed7a0a7b0 WHIRLPOOL 444bf99b0e84390b76c0cc83400164eed3ab57c568d1b045bfd41af0f2ba043547ed492b81ce99909e304dcfc0914da7a2ea6a2d2c7c70fda8664580615b6097
 DIST php-5.4.4RC2.tar.bz2 11148620 SHA256 68339730f17f27c76a20a619c8283d536eb4e2dad043a34aa411a838630cfad1 SHA512 79c92a1dfec92dd8e257978840ef456ab36e478b6ea028a3362b11250b9ea2ad2ef9ea7ee1df4a4d50ea5be95243a0335d8a4bff444e8e4daa68dd64ecb550cb WHIRLPOOL 12ea406fb0eea567f399b1d77f84f3bcb1c0a5be5787d6d46d07c3f54af289cfafbff773a80027c8934c51ee40930dc573e369a2dbc033a0dcd7b3199475b981
+DIST php-5.4.5.tar.bz2 11011780 SHA256 7af9a1b6b1653f15d679c8e505b24c4dc2dc2a8d55521a142a7f523d06ae6ad9 SHA512 568144b57ecf8ceadbeb33a2071bae68a58e60624084fec4e6b11f96c94ad2bc136a0db9a8d8a1b1663a7baf8a0a97dacf35578cfde0642ee0cc8b047c177866 WHIRLPOOL ecb8c8c35cf896db94c5f5c9a673fbabd40ba71511fd651ac52f2b6dd25070dc5236854149f51e550f58aa26214693d0875cad4bd6bbbb820062143eac27d71d
 DIST php-patchset-5.3.13-r0.tar.bz2 7358 SHA256 9e638756c52417994579a8a859af43caa666530401e1c633612ac17dfc221b3c SHA512 ad097bfc72502648d5e23a7e38a226517e983d5006526d018b188d4ac0e17904b524faf7ca943c8e380c9270d7ffa79ffd281eca25b80794e914133de1aa134c WHIRLPOOL eeb2a9f939016c282b0994650d3e77f2ba2e31054c6447bdf6f9b417e9bd24956f0153633d1311e47cbcbc3e33a9edc7f6363933a35ab91c92887528ef117449
 DIST php-patchset-5.3.14-r0.tar.bz2 7355 SHA256 a29396e8b9dfaa77413cf979ebe1af88960ca73988003ba95c9015bdc0a7869b SHA512 c7ecf7b84c49468fc1f0284559d6b26206714c436f597f3e4ae630d14a5653ae1e5d05434d406cc9cd4dd3301c9c15ab9c8bb3ec4c659625f4757d4f9f27e9dc WHIRLPOOL 8445d567dfdec8363cbb0c4ba425957f59d0bdfaebea3ba77e35a9e07d2bffcf444c65950a97bb56005d673ed4a50867bbac50aa0133a0b5503fc31289c5b45f
 DIST php-patchset-5.3.14_rc2-r0.tar.bz2 7368 SHA256 08b02bc777eb3b7b1458fc0737dae1ac3654f921df9c97212a99c5d1cfd08fac SHA512 b5a2de91cc984baa3290b15016153ddb041f14f11640314af404adebfc4b4de08dc18aa9e8add1dafc05ebead85e39996cf077647490cf6418f96144c3dcd73e WHIRLPOOL 86dc89e03c83e79392d9fc3a71724e61db93d1ee9241a47e2b691dec06cf395ed02c1126c9e76d393b6daba4f778d6d0a15c59149b3967dc8f70be07df395ccf
+DIST php-patchset-5.3.15-r0.tar.bz2 7357 SHA256 df239b883d40386cf98e44bd107a36ebcb34554058c0857748c5715ba2dcb1e8 SHA512 c1bd1933a2119037c38fbb46fc0799dd0a9c5acaf11fc4d8d885f644a429350ddcf170bb74e91bfa11139e35b52c73c5db60a2783ab0b5113c675373699c11d1 WHIRLPOOL 87a2993c0c9573241f73e1fa3f0e6bcaee39df6f4ce5501299ea84731ef15eeca05e3d04948c92cf278df6c45edc3f580c28a99667f22d377b1566662c67ff9f
 DIST php-patchset-5.4-2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
 DIST suhosin-patch-5.3.9-0.9.10.patch.gz 40967 SHA256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317 SHA512 98c56d41fac123626cbd1bcf4ca8afba5a9a960fd58a60e08c91a68cab7589162c4f9e1b0c39abaf173775cb63091a04c4224ee278410ec0afdbe9f3cf05f322 WHIRLPOOL f551823324919cc14cc5f0b4dc2ed75e292fcb2dbe3a34b2c954d4f3cd8ff27937b7a8a0e5665ddc4e737908d2530abf3c61397b040dd6aadcc31163d762b42e
--- a/dev-lang/php/php-5.3.15.ebuild
+++ b/dev-lang/php/php-5.3.15.ebuild
@ -0,0 +1,392 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.15.ebuild,v 1.1 2012/07/20 07:44:25 olemarkus Exp $
+
+EAPI=4
+
+PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
+
+RESTRICT="mirror"
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+SUHOSIN_VERSION="5.3.9-0.9.10"
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"suhosin")
+			echo "http://download.suhosin.org/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+
+# 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"
+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="olemarkus"
+else
+	SUHOSIN_TYPE="suhosin"
+fi
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+	SRC_URI="${SRC_URI}
+		suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+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 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]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	kolab? ( >=net-libs/c-client-2004g-r1 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( =dev-db/sqlite-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? (
+			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] )"
+
+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 "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 v3 ; }
+src_configure() { eblit-run src_configure v53 ; }
+src_compile() { eblit-run src_compile v1 ; }
+src_install() { eblit-run src_install v3 ; }
+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.5.ebuild
+++ b/dev-lang/php/php-5.4.5.ebuild
@ -0,0 +1,385 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.5.ebuild,v 1.1 2012/07/20 16:12:42 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+
+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://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-stas"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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"
+
+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="
+	>=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 ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+[[ -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 v54 ; }
+src_compile() { eblit-run src_compile v2 ; }
+src_install() { eblit-run src_install v3 ; }
+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-php/suhosin"
+		ewarn
+	fi
+}
--- a/dev-libs/dbus-glib/dbus-glib-0.100.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.100.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100.ebuild,v 1.1 2012/06/27 10:58:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100.ebuild,v 1.2 2012/07/20 15:07:19 jer Exp $

 EAPI=4
 inherit bash-completion-r1 eutils
@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"

 RDEPEND=">=sys-apps/dbus-1.6
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild,v 1.4 2012/05/04 13:07:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild,v 1.5 2012/07/20 10:45:29 angelos Exp $

 EAPI=4

@ -36,8 +36,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_prepare() {
-	# Drop DEPRECATED flags, bug #391103
+	# Drop DEPRECATED flags, bug #391103 and -Werror (bug #414323)
 	sed -i \
+		-e 's:-Werror::g' \
 		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
 		{libdbusmenu-{glib,gtk},tests}/Makefile.{am,in} configure{,.ac} || die
 }
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild,v 1.4 2012/05/04 13:07:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild,v 1.5 2012/07/20 10:45:29 angelos Exp $

 EAPI=4

@ -34,8 +34,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_prepare() {
-	# Drop DEPRECATED flags, bug #391103
+	# Drop DEPRECATED flags, bug #391103 and -Werror (bug #414323)
 	sed -i \
+		-e 's:-Werror::g' \
 		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
 		{libdbusmenu-{glib,gtk},tests}/Makefile.{am,in} configure{,.ac} || die
 }
--- a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch
+++ b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch
@ -1,6 +1,6 @@
-http://libusb.org/ticket/138
-http://sourceforge.net/apps/trac/libusbx/ticket/31
 http://bugs.gentoo.org/423135
+http://sourceforge.net/apps/trac/libusbx/ticket/31
+http://github.com/libusbx/libusbx/commit/7ec94a45ed8155e7a1d4d5d75575099b09c78834

 --- libusb/core.c
 +++ libusb/core.c
--- a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.10 2012/07/01 18:08:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.11 2012/07/21 06:47:11 ssuominen Exp $

 EAPI=4
 inherit eutils
@ -24,7 +24,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch

-	has_version dev-libs/libusbx && \
+	has_version '<dev-libs/libusbx-1.0.13' && \
 		epatch "${FILESDIR}"/${PN/-compat}-0.1-libusbx.patch
 }

--- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.4 2012/06/01 08:06:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.5 2012/07/21 02:20:03 blueness Exp $

 EAPI=4
 inherit flag-o-matic toolchain-funcs eutils multilib
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"

 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"

 RDEPEND=""
--- a/dev-python/dbus-python/dbus-python-1.1.1.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.1.1.ebuild,v 1.1 2012/06/27 11:00:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.1.1.ebuild,v 1.2 2012/07/20 15:08:02 jer Exp $

 EAPI=4

@ -17,7 +17,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"

 RDEPEND=">=dev-libs/dbus-glib-0.100
--- a/dev-python/milk/Manifest
+++ b/dev-python/milk/Manifest
@ -1 +1 @@
-DIST milk-0.4.2.tar.gz 80508 SHA256 055b32d22d31cb83dc76092c3db5f339d3ce795a6061747d39fa13948c82fbbb SHA512 ff7164bbd61ff2d1e2553bcdf87be30e7add0a7d82b1a2e123dc6134ba4c351294dbf84fdfc8096e5cb50c979c2f1cafeaec8aa8237f3a389ade24b3fd4ab4c5 WHIRLPOOL 3a6bc298f3a224ce430fee09a57721eedb955e7f75aebca6864f60a7f5ea1288e3722ffd7ab7241fbf2cfb2252e4e9c7fdb9de3591df1aa548eb44a759f50484
+DIST milk-0.4.2.tar.xz 108792 SHA256 943a4667f20540fe7799c7ce16f54266d408aa89045047bb7c32b18e02b80281 SHA512 f6e7d5da7fe776308c01e7bf2e3abaa0cee7490f8eee0cc91f2ab04685f7a480ac5b18a9a45cdef99d281837e31c839585448c793ad0a0938d2a871d9e7762ec WHIRLPOOL f52312b4631d3f63a6b094f1cc402e2e397be9543342dc1937dc1d0b24c85693deaed768b098696cef5e2b20297f1063301905f4fd4d79d0c52eb4474cd3b845
--- a/dev-python/milk/metadata.xml
+++ b/dev-python/milk/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
  Milk is a machine learning toolkit in Python.
  Its focus is on supervised classification with several classifiers
  available: SVMs (based on libsvm), k-NN, random forests, decision
--- a/dev-python/milk/milk-0.4.2.ebuild
+++ b/dev-python/milk/milk-0.4.2.ebuild
@ -1,25 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/milk/milk-0.4.2.ebuild,v 1.2 2012/06/07 06:11:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/milk/milk-0.4.2.ebuild,v 1.3 2012/07/21 07:19:46 jlec Exp $

 EAPI=4

-# python cruft
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
 DISTUTILS_SRC_TEST="setup.py"
-RESTRICT_PYTHON_ABIS="3.*"

 inherit distutils

 DESCRIPTION="Machine learning toolkit in Python"
 HOMEPAGE="http://luispedro.org/software/milk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# missing file from VCS added, bug 427416
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"

 LICENSE="MIT"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+
 RDEPEND="dev-python/numpy"
-DEPEND="dev-python/setuptools
+DEPEND="
+	dev-python/setuptools
 	test? ( dev-python/milksets sci-libs/scipy )"
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@ -1,4 +1,3 @@
 DIST mail-2.2.19.tar.gz 655385 SHA256 ddd32479389e25af6819d5485c466ba2d64e10b5fffae88b14c3342c59009b5e SHA512 3bbbe2b2a9be4a6b7a4113ba7537fd64ba5700b282726a24ec74ac3c0ae96fca28b1924da3bf1b5c0bafff0af5e0dbc10e22ca1d071320762aeede7ea5f69741 WHIRLPOOL b97e95fe4c0b0404baec16abc426e116da719fb0b0796a4add4df3fbb46709f79e30e2043111c02f5847e5e7f047fac36e514a0c167dd6501bffd0cf74299962
-DIST mail-2.3.0.tar.gz 667908 SHA256 0d156d2167eec03e9b7a288368261cd8d434a463f21f4953c9ab44a993f98d9c SHA512 e67a09b9fb2fde39e57ae3816d95947413e09277f1edc6584b1ba03a9a063bdc4fdbb206d29d5c63ddbe14fb133cfb14f7158bc08a340e6710d97c532cd59627 WHIRLPOOL 062b71c2184b0a5a958a6c6464c1f74354ce3ba4bb3cdb1399b670d1194ecd96b14ec678ba3636f3e66a81df3f72865139d0e653817957518dba111695a8ecba
 DIST mail-2.3.3-git.tar.gz 668618 SHA256 1adb276d2de312bd95fbe5552b9df2c3b802eedbdaaf25dbbbcd4cf45b5951e0 SHA512 b6478f9b63fe6855ff857443aab718ff9a66b6b603aa203f6cf6cc2a32ccd3c3b52d0ce8697c84285a209fd2cf30c31e12addffe1b7eb5326c806553817f0523 WHIRLPOOL 7a8f020c89d38343ce6305a6f926f709298093198a285dd5d7ae1d9f7bd728e19c3119abc293ede81aee63dde254cfa387972cffdc5df48c887fe7102a0585e1
 DIST mail-2.4.4.tar.gz 677102 SHA256 2195c789c5178388f3ed5094ddad93683bac601fe3d9ecb13a3a9f9e7d97ba87 SHA512 aeb0075950d5938e1a972c9195ec836160c6c9f600aaa2c0e78c715aabf4000074bde311cc0c87a1f3edf237e5a6835299c23f3b903541a043134139472eae82 WHIRLPOOL e75e9e62602ca13658e16d096cc48921307c9035e1b42700eaee77d38c4f10891731d34e0984c8eb98d2d30320ac87fb64b5cf03bc1c88eeb11be5d172a594d8
--- a/dev-ruby/mail/mail-2.3.0.ebuild
+++ b/dev-ruby/mail/mail-2.3.0.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.3.0.ebuild,v 1.3 2012/03/11 14:41:09 ranger Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="mikel"
-COMMIT="e8ec8d53c4f5c889691630d0422b9dc044762f1b"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2.3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-2.3.6
-	>=dev-ruby/i18n-0.4.0
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/treetop-1.4.8"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:0 )
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-
-	# Fix up dependencies to match our own.
-	sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
-}
-
-each_ruby_prepare() {
-	# Comment out failing specs on ruby19. Reported upstream:
-	# https://github.com/mikel/mail/issues/318
-	case ${RUBY} in
-		*ruby19)
-			sed -i -e '/should return itself on sort/,/end/ s:^:#:' spec/mail/parts_list_spec.rb || die
-			sed -i -e '/should encode a non us-ascii filename/,/^    end/ s:^:#:' spec/mail/fields/content_type_field_spec.rb || die
-			;;
-	esac
-}
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-atk/ruby-atk-1.1.0.ebuild
+++ b/dev-ruby/ruby-atk/ruby-atk-1.1.0.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-atk/ruby-atk-1.1.0.ebuild,v 1.1 2012/01/07 22:21:58 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="${DEPEND} dev-libs/atk"
-RDEPEND="${RDEPEND} dev-libs/atk"
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.1.0.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.1.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.1.0.ebuild,v 1.1 2012/01/07 22:12:41 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="gdk_pixbuf2"
-
-inherit ruby-ng-gnome2
-
-S=${WORKDIR}/ruby-gnome2-all-${PV}/gdk_pixbuf2
-
-DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@ -1,3 +1,2 @@
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-gio2/ruby-gio2-1.1.0.ebuild
+++ b/dev-ruby/ruby-gio2/ruby-gio2-1.1.0.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gio2/ruby-gio2-1.1.0.ebuild,v 1.1 2012/01/07 21:45:39 naota Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GooCanvas"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@ -1,5 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
-DIST ruby-gnome2-all-1.1.2.tar.gz 1008553 SHA256 da420d4188c9bec7a7facb52c7f94cdd16b7cfb494418414afcd6efcb8682cb6 SHA512 2dfde18fa311c5b5ac0c4f3e537fbde05a639e12a52754c463e9374ac35ae4e68ce96cff3851b9a8e3549051a17b8ca3b2cd726a9c84b6658a59d018d9047e6b WHIRLPOOL 03c884111f93827f39769b46d42ed523d4a93bd060558aec4916e2ed353a1b33eab68fd21133690fbfb7d8b9a2e6dce311a2f5c7ed7901ac1c6c30c26a1c9140
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-glib2/ruby-glib2-1.1.0.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-1.1.0.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-1.1.0.ebuild,v 1.2 2012/04/03 11:22:10 graaff Exp $
-
-EAPI="3"
-USE_RUBY="ruby18 ree18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="${RDEPEND} >=dev-libs/glib-2"
-DEPEND="${DEPEND}
-	>=dev-libs/glib-2"
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
--- a/dev-ruby/ruby-glib2/ruby-glib2-1.1.2.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-1.1.2.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-1.1.2.ebuild,v 1.1 2012/04/03 11:23:54 graaff Exp $
-
-EAPI="3"
-USE_RUBY="ruby18 ree18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="${RDEPEND} >=dev-libs/glib-2"
-DEPEND="${DEPEND}
-	>=dev-libs/glib-2"
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-1.1.0.ebuild
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-1.1.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gnome2/ruby-gnome2-1.1.0.ebuild,v 1.1 2012/01/08 06:56:29 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby Gnome2 bindings"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
-SRC_URI=""
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2"
-DEPEND="${DEPEND}
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2"
-
-ruby_add_rdepend ">=dev-ruby/ruby-gio2-${PV}
-	>=dev-ruby/ruby-goocanvas-${PV}
-	>=dev-ruby/ruby-gstreamer-${PV}
-	>=dev-ruby/ruby-gtk2-${PV}
-	>=dev-ruby/ruby-gtksourceview-${PV}
-	>=dev-ruby/ruby-poppler-${PV}
-	>=dev-ruby/ruby-rsvg-${PV}
-	>=dev-ruby/ruby-vte-${PV}"
--- a/dev-ruby/ruby-gnomevfs/Manifest
+++ b/dev-ruby/ruby-gnomevfs/Manifest
@ -1 +0,0 @@
-DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
--- a/dev-ruby/ruby-gnomevfs/metadata.xml
+++ b/dev-ruby/ruby-gnomevfs/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ruby</herd>
-</pkgmetadata>
--- a/dev-ruby/ruby-gnomevfs/ruby-gnomevfs-0.19.4.ebuild
+++ b/dev-ruby/ruby-gnomevfs/ruby-gnomevfs-0.19.4.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gnomevfs/ruby-gnomevfs-0.19.4.ebuild,v 1.8 2012/07/01 18:31:45 armin76 Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GnomeVFS bindings"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/gnome-vfs-2.2"
-DEPEND="${DEPEND}
-	>=gnome-base/gnome-vfs-2.2
-	virtual/pkgconfig"
-
-each_ruby_test() {
-	cd tests
-	ruby -I../src/lib -I../src test1.rb || die "test1.rb failed"
-	ruby -I../src/lib -I../src test2.rb || die "test2.rb failed"
-	ruby -I../src/lib -I../src test3.rb || die "test3.rb failed"
-}
--- a/dev-ruby/ruby-goocanvas/Manifest
+++ b/dev-ruby/ruby-goocanvas/Manifest
@ -1,3 +1,2 @@
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-goocanvas/ruby-goocanvas-1.1.0.ebuild
+++ b/dev-ruby/ruby-goocanvas/ruby-goocanvas-1.1.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-goocanvas/ruby-goocanvas-1.1.0.ebuild,v 1.1 2012/01/07 21:55:11 naota Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GooCanvas"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	x11-libs/goocanvas:0"
-DEPEND="${DEPEND}
-	x11-libs/goocanvas:0"
-
-ruby_add_bdepend "dev-ruby/pkg-config
-	dev-ruby/rcairo"
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-1.1.0.ebuild
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-1.1.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gstreamer/ruby-gstreamer-1.1.0.ebuild,v 1.2 2012/05/04 18:47:54 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	=media-libs/gstreamer-0.10*
-	=media-libs/gst-plugins-base-0.10*"
-DEPEND="${DEPEND}
-	=media-libs/gstreamer-0.10*
-	=media-libs/gst-plugins-base-0.10*
-	virtual/pkgconfig"
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-1.1.0.ebuild
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-1.1.0.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-1.1.0.ebuild,v 1.1 2012/01/07 22:30:27 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} x11-libs/gtk+:2"
-RDEPEND="${RDEPEND} x11-libs/gtk+:2"
-
-ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-pango-${PV}"
-ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
-	>=dev-ruby/ruby-atk-${PV}
-	>=dev-ruby/ruby-gio2-${PV}"
--- a/dev-ruby/ruby-gtkglext/Manifest
+++ b/dev-ruby/ruby-gtkglext/Manifest
@ -1 +0,0 @@
-DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
--- a/dev-ruby/ruby-gtkglext/metadata.xml
+++ b/dev-ruby/ruby-gtkglext/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ruby</herd>
-</pkgmetadata>
--- a/dev-ruby/ruby-gtkglext/ruby-gtkglext-0.19.4.ebuild
+++ b/dev-ruby/ruby-gtkglext/ruby-gtkglext-0.19.4.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtkglext/ruby-gtkglext-0.19.4.ebuild,v 1.9 2012/07/01 18:31:39 armin76 Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GtkGLExt bindings"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/gtkglext-1.0.3
-	x11-libs/gtk+:2"
-DEPEND="${DEPEND}
-	>=x11-libs/gtkglext-1.0.3
-	x11-libs/gtk+:2
-	virtual/pkgconfig"
-
-ruby_add_rdepend "dev-ruby/ruby-opengl
-	dev-ruby/ruby-glib2
-	dev-ruby/ruby-gtk2"
--- a/dev-ruby/ruby-gtkhtml2/Manifest
+++ b/dev-ruby/ruby-gtkhtml2/Manifest
@ -1 +0,0 @@
-DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
--- a/dev-ruby/ruby-gtkhtml2/metadata.xml
+++ b/dev-ruby/ruby-gtkhtml2/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ruby</herd>
-</pkgmetadata>
--- a/dev-ruby/ruby-gtkhtml2/ruby-gtkhtml2-0.19.4.ebuild
+++ b/dev-ruby/ruby-gtkhtml2/ruby-gtkhtml2-0.19.4.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtkhtml2/ruby-gtkhtml2-0.19.4.ebuild,v 1.7 2012/05/04 18:47:55 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GtkHtml2 bindings"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	=gnome-extra/gtkhtml-2*"
-DEPEND="${DEPEND}
-	=gnome-extra/gtkhtml-2*
-	virtual/pkgconfig"
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-gtk2-${PV}"
-
-S="${WORKDIR}/ruby-gnome2-all-${PV}/gtkhtml2"
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@ -1,3 +1,2 @@
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-1.1.0.ebuild
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-1.1.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-1.1.0.ebuild,v 1.2 2012/05/04 18:47:55 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="gtksourceview2"
-
-inherit ruby-ng-gnome2
-
-S=${WORKDIR}/ruby-gnome2-all-${PV}/gtksourceview2
-
-DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	x11-libs/gtksourceview:2.0"
-DEPEND="${DEPEND}
-	x11-libs/gtksourceview:2.0
-	virtual/pkgconfig"
-
-ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
--- a/dev-ruby/ruby-panel-applet2/Manifest
+++ b/dev-ruby/ruby-panel-applet2/Manifest
@ -1 +0,0 @@
-DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
--- a/dev-ruby/ruby-panel-applet2/metadata.xml
+++ b/dev-ruby/ruby-panel-applet2/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>ruby</herd>
-</pkgmetadata>
--- a/dev-ruby/ruby-panel-applet2/ruby-panel-applet2-0.19.4.ebuild
+++ b/dev-ruby/ruby-panel-applet2/ruby-panel-applet2-0.19.4.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-panel-applet2/ruby-panel-applet2-0.19.4.ebuild,v 1.7 2012/05/04 18:47:55 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Panel-applet bindings"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-	=gnome-base/libgnome-2*
-	=gnome-base/libgnomeui-2*"
-DEPEND="${DEPEND}
-	>=gnome-base/gnome-panel-2.8
-	=gnome-base/libgnome-2*
-	=gnome-base/libgnomeui-2*
-	virtual/pkgconfig"
-
-ruby_add_rdepend ">=dev-ruby/ruby-gnome2-${PV}
-	>=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-gtk2-${PV}"
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-pango/ruby-pango-1.1.0.ebuild
+++ b/dev-ruby/ruby-pango/ruby-pango-1.1.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-pango/ruby-pango-1.1.0.ebuild,v 1.1 2012/01/07 22:06:41 naota Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="${DEPEND}
-	>=x11-libs/pango-1.2.1
-	>=dev-ruby/rcairo-1.2.0"
-RDEPEND="${RDEPEND}
-	>=x11-libs/pango-1.2.1
-	>=dev-ruby/rcairo-1.2.0"
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-poppler/ruby-poppler-1.1.0.ebuild
+++ b/dev-ruby/ruby-poppler/ruby-poppler-1.1.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-poppler/ruby-poppler-1.1.0.ebuild,v 1.2 2012/05/04 18:47:55 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	app-text/poppler[cairo]"
-DEPEND="${DEPEND}
-	app-text/poppler[cairo]
-	virtual/pkgconfig"
-
-ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2
-	>=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-gtk2-${PV}"
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-1.1.0.ebuild
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-1.1.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rsvg/ruby-rsvg-1.1.0.ebuild,v 1.2 2012/05/04 18:47:54 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME=rsvg2
-
-inherit ruby-ng-gnome2
-
-S=${WORKDIR}/ruby-gnome2-all-${PV}/rsvg2
-
-DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo"
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/librsvg-2.8"
-DEPEND="${DEPEND}
-	>=gnome-base/librsvg-2.8
-	virtual/pkgconfig"
-
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
-	>=dev-ruby/ruby-gdkpixbuf2-${PV}
-	cairo? ( dev-ruby/rcairo )"
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@ -1,4 +1,3 @@
 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9
 DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4 SHA512 79abf23abbb4f110d314afea6d093c57513c51df431150fb8c853c1f47983b78e8253528e619f94705df57cf7e94aee62641f0804f17d94f36910fe87e7d7090 WHIRLPOOL 5b92fdd39c89c4c062cbe901db8849636c7d35c59b14c1467d4a8c644ec81403bd4f6d3424eaab73358776d585a11eb59ce205d840254117ff9ea1c111ee0bf3
-DIST ruby-gnome2-all-1.1.0.tar.gz 1006675 SHA256 e54cef710c6ec43129086fbdc9173b0cc2d04a6e22a5e779073c9692fea3561f SHA512 fd0e1800b67260d99f1c1d1ec4777b9be4d6115caa879188d76673d8507d0c6d38d79776dc9a481cea543a78be861b12eff08bf961709994b1f380614b37f9ae WHIRLPOOL 1f3b6f4d14eefbeeb60b44e23eaf083fa3ff6aa6a6a8da4df6d1c2d623aa9aa6c10f9c3eb3aa841f97909c04a63a1a56990aed95224007f48dc651fc9af891f4
 DIST ruby-gnome2-all-1.1.3.tar.gz 1012514 SHA256 b25ca85e25a607379e26d6e556a153ab41c155e92c167aa6843df59cdb560288 SHA512 307d4c408edbae6467ae2455305d88e40f35067c613c00fcbd0109b42f9fc5cf277f22a5db50f78a2ac3cbc64792a1262e40b883c16f49f408372666f0cd4462 WHIRLPOOL c1446eb1b3e55050ece5b45554bc5fdf9c2816eac1a2852312dae713ee0ead6c883279b97dcfe01033f1f806181dd75549d4b0f7fec6ad7bb9fd53fa32e90c73
--- a/dev-ruby/ruby-vte/ruby-vte-1.1.0.ebuild
+++ b/dev-ruby/ruby-vte/ruby-vte-1.1.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-vte/ruby-vte-1.1.0.ebuild,v 1.2 2012/05/04 18:47:54 jdhore Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby vte bindings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/vte-0.12.1:0"
-DEPEND="${DEPEND}
-	>=x11-libs/vte-0.12.1:0
-	virtual/pkgconfig"
-
-ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@ -1,2 +1 @@
-DIST session-2.4.0.tgz 20709 SHA256 67a8977e458aaa469dc24d90b7163690315b71b45eca99e98a0843d1c9e97c78 SHA512 8e9d203914176cb47f7441f6a3ced23867fe805e55142a018f7370d12678c7a8dcdd82fefc7138d689aebbf68628705562c33fd4c27e855db1db950847ccc968 WHIRLPOOL 27873f6f762c0abb557873904aa41e27fb0be115e5cf40a7f29fd555df183489986ce6a91c875c2e658abbc5d92f00a01c71aebd2a7186ec989e27ffdaad55b1
 DIST session-3.1.0.gem 15872 SHA256 4be736d4d0110dbac8cf0e5b0c08278c7ae017308b04267179e9ef0769089869 SHA512 60dcc0d0f196a2a77cc880b9d5a796b68dcee7bfac388c02e3442e3d179aa1c59afd203edf6d81ca7b7e5e6338e522067a1407422b944834d6ed632ada34eac4 WHIRLPOOL f4461cb9de0eefd4fc51da3eae2a79d7564b7e699cbbbf0cded82b3ddae08c3c2bd2752cb9ab974eaea61f9fa610eb7cd8dba5abe01ba236363d1aee79944eff
--- a/dev-ruby/session/session-2.4.0.ebuild
+++ b/dev-ruby/session/session-2.4.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-2.4.0.ebuild,v 1.10 2012/05/01 18:24:02 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A set of classes to drive external programs via pipe"
-HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
-SRC_URI="http://codeforpeople.com/lib/ruby/session/${P}.tgz"
-
-# License info based on http://github.com/ahoward/session as indicated
-# by author.
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
-all_ruby_prepare() {
-	# needed to void a collision with the Timeout::Error alias in Ruby
-	# 1.8.7 at least.
-	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			epatch "${FILESDIR}"/${P}-jruby.patch
-			;;
-	esac
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/* || die
-}
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@ -1 +1,2 @@
+DIST pkgconf-0.8.1.tar.bz2 81740 SHA256 65e11b5d9b35de3e89d5c285cd4abb84ce82ee05a5feac1e829395bb257b53d7 SHA512 74854d2d1f4e76d34f325777c60ed456323ebdb1e1e806a89e0ac87959bc5dda8918ca775da563f9eb7f542cdb42787c96b4d346451ff835f84e1dec4e9b4345 WHIRLPOOL d0f1be6ea8af07cccbae505cb80210fe39bcf97c78669366925337a4862e1e8e06bffab21335aa4a430961bef77a19b7523dd1a7964317cce6c5983ebb3e63eb
 DIST pkgconf-0.8.tar.bz2 80986 SHA256 8ce5a64b74dff76dad042ff2386d48eee6416d46580328e1a9042aef0f95adc5 SHA512 f9d653ed40ff24176bc4ad08d11abfbe42cacf06633c711a2ab5d271992b48b6cc2862fd07b5820d705d87ec973bbfbf4d40d698fc8506f375aa7f9f67f16dfc WHIRLPOOL f9752c8a058dbd902c57378514a32670a68282a45aa831705461650f8b5d1f0304f9930e12ef73e921b5d0479358832b5958972f631083632edc76410286d485
--- a/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch
+++ b/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch
@ -0,0 +1,66 @@
+commit 840ecc846d1a168b475a31bb927b78c3677d565a
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Sat Jul 21 01:09:13 2012 -0500
+
+    Add autoconf macros to help packagers install .pc files
+    
+    Some distros and users have unusual installation needs that don't
+    conform to the standard $libdir/pkgconfig and $datadir/pkgconfig
+    pathways. Help packagers support these users with the macros
+    PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR. These are simple macros that
+    provide the configure parameters --with-pkgconfigdir and
+    --with-noarch-pkgconfigdir to allow users to override the standard
+    locations.
+    
+    Freedesktop #48743
+
+diff --git a/pkg.m4 b/pkg.m4
+index 4748f99..0354609 100644
+--- a/pkg.m4
+++ b/pkg.m4
+@@ -158,6 +158,45 @@ else
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+ # PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+ #                  [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+ #                  [DESCRIPTION], [DEFAULT])
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='pkg-config'>Install as a replacement for dev-util/pkgconfig</flag>
+	<flag name='pkg-config'>Install as a replacement for dev-util/pkgconfig</flag>
+	<flag name='strict'>Adhere to POSIX pkg-config specification. Useful for finding uses of non-standard pkg-config invocations.</flag>
 </use>
 </pkgmetadata>
--- a/dev-util/pkgconf/pkgconf-0.8.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.8.1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.8.1.ebuild,v 1.2 2012/07/21 06:35:44 jdhore Exp $
+
+EAPI="4"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/nenolod/pkgconf.git"
+	inherit autotools git-2
+else
+	#inherit autotools vcs-snapshot
+	inherit eutils
+	#SRC_URI="https://github.com/nenolod/pkgconf/tarball/${P} -> ${P}.tar.gz"
+	SRC_URI="http://nenolod.net/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/nenolod/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-newm4.patch
+	[[ -e configure ]] || AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable strict)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
--- a/dev-util/pkgconf/pkgconf-0.8.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.8.ebuild,v 1.12 2012/07/15 17:12:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.8.ebuild,v 1.13 2012/07/21 03:56:04 jdhore Exp $

 EAPI="4"

@ -11,7 +11,7 @@ else
 	#inherit autotools vcs-snapshot
 	inherit eutils
 	#SRC_URI="https://github.com/nenolod/pkgconf/tarball/${P} -> ${P}.tar.gz"
-	SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
+	SRC_URI="http://nenolod.net/~nenolod/distfiles/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf SHA512 0033c8b0b0a8103f37b670d7eb102aab6fbe8638b37e5b92276244d176f6708c1320dda6d6ef2f0263b1ac7419eef2ea6c72a023dbabed6a11a070ef964d905e WHIRLPOOL 29bb893698bab784cec9829b52e1035489836f7d516bce53e93f0eb7cc6f4af175d77f6f029e183e2f98aa538534405b8e0c5ce37fcfbb15db2f5f6b1f842ef9`