Sync with portage [Sun Apr 27 21:28:32 MSK 2014].

app-accessibility/accerciser/Manifest

@@ -1,2 +1,3 @@
 DIST accerciser-1.12.1.tar.bz2 1554921 SHA256 addbc940a05c0dacb6131c8e0b136c14eab73c57bfe50c110cef4d3723d07807 SHA512 f769af63a3cfe3e868769205fc270ff2948ceebd0e8965016f18ec0062dfdc398c6bd82dbe5ef40d555ea711bd6be529235803fe86dffd3828fd8183e095a06b WHIRLPOOL 0cf90b3d83a9a6e595af23aaacdcc28d57ab20b08bc97252a252e39ad9f20a6114da5f777996f6e36c23f8c3bcf097f8b63d7769d7b578dc50f556e68a95d834
+DIST accerciser-3.12.0.tar.xz 3212432 SHA256 0d421a59cd294966441fb6591d34f28e4b60340815bdf91c9e8f39c2d826e96b SHA512 d15d301f7579a92e3b3aa65d22fd726d71bee8330b450c7ed232d4a8d7fc312402573073f67a490ab659122ad98651f8a073235770caa9eba8a4b6dc9d68e6d3 WHIRLPOOL 4b753de73afc1c8fda7d71a8b6f8007ebb4627985a6049be887d8e916f4e37c3a5484a481d8e516a1d4cc245e987ed29a2a87c2780b882bced032f5d2d14d5d6
 DIST accerciser-3.8.2.tar.xz 3207500 SHA256 f4fef2bfa23a9344b613c39dfa128e4d07d98f87cd5011d7d649b2a9c0a6aadd SHA512 a4441a5468bb27b8c88cdab60f96c86f4247dbd8cf04f0a5949cceceeab92f47a2b73bbf9264fd0043888b78f8a00a8578e0873f31fdf9cc6e15add4a444ab5c WHIRLPOOL e88cda221532dd983be6ead2c8c632fe2f1faf7f9c36eeebb0568c4acc71afcf1ed0f15e4dc31bb910abb6fd3423039fa05fc188ec16b9eccd9b3ff145adfa2f

app-accessibility/accerciser/accerciser-3.12.0.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/accerciser/accerciser-3.12.0.ebuild,v 1.1 2014/04/27 11:25:20 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_2,3_3} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="http://live.gnome.org/Accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection
+	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Leave shebang alone
+	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_doscript src/accerciser
+	}
+	python_foreach_impl run_in_build_dir installing
+}

app-accessibility/accerciser/metadata.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+  <herd>gnome-accessibility</herd>
-<longdescription lang="en">
+  <longdescription lang="en">
 Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.
 
 In essence, Accerciser is a next generation at-poke tool.
 </longdescription>
 </pkgmetadata>
-

app-accessibility/at-spi2-atk/Manifest

@@ -1 +1,2 @@
 DIST at-spi2-atk-2.10.2.tar.xz 271388 SHA256 e348a811c4830251f0c3018019072e7979ef35fb9b7f0b1b0a0dd1e66942d0f5 SHA512 9300150b42d6baf84fced4aec69f874abbd1a24b29a6f1cf62ad18d0a83f83fa00d711d65464eaef714bff69283e990e479774d26362093fe8f49b1cf7ef7239 WHIRLPOOL c84756683ab0dc07f3ee2e0efd7499a102e1c32e9fd0ea150a6c61d469452ec6d5bae14e7d80ac277351b39859a6d6b9f72079e809dde29f125a2e4d5f8cdaf1
+DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5

app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1.ebuild,v 1.1 2014/04/27 11:28:03 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.11.2
+	>=dev-libs/atk-2.11.90
+	>=dev-libs/glib-2.32:2
+	>=sys-apps/dbus-1.5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --enable-p2p
+}
+
+src_test() {
+	Xemake check
+}

app-accessibility/at-spi2-core/Manifest

@@ -1 +1,2 @@
 DIST at-spi2-core-2.10.2.tar.xz 446272 SHA256 d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1 SHA512 51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da WHIRLPOOL 480ab9c3c037e53f220abc42be9f09ea179a19de62b640efe0697ced1c04122d387eff8fc3fe7e359ea853de4415a3eddc42aa3fa18a00ddb57a1fa426a030e6
+DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a

app-accessibility/at-spi2-core/at-spi2-core-2.12.0.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0.ebuild,v 1.1 2014/04/27 15:12:43 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="+X +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=sys-apps/dbus-1
+	x11-libs/libSM
+	x11-libs/libXi
+	x11-libs/libXtst
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	gnome2_src_configure \
+		--disable-xevie \
+		$(use_enable introspection) \
+		$(use_enable X x11)
+}

app-accessibility/orca/Manifest

@@ -1,3 +1,4 @@
 DIST orca-2.32.1.tar.bz2 2653300 SHA256 44da9da70c1b47bc87fda8f3b9da4cc1df9993d92388434f5707d39b5a832629 SHA512 d51c5ddfc979e57404b44961bd244dd639551bf9fd086326a4274a9713ec6eebe9aee6a381ee4abf47f211e034ebd2985c8a90303590094997bc10021364f796 WHIRLPOOL 2dcc5168947a25c5b918a6e98daeec246d712c34bc12ce55aa1edc1258c73b83aa7cba23d94f521bc9aec8e763601f7523a9cd91d6abc6119eb2defc47835c55
 DIST orca-3.10.2.tar.xz 3838744 SHA256 e30ad5044a68101bc724635693058df75f4ec1b495a9d6cb7954608f1f99bfff SHA512 194320a1c14c80201839e6985897ea91939c9e0b9ffedf6850efe35f6fa7937833826b11c1998d5cdacbe216373a1528f771f4f49b1b06f32e9100ca336c3ec1 WHIRLPOOL faad2a42955e8f2eb7249e7f080ee4c064047dec93da8c9bf8e4021309d5a9f2fb0da1c415c3a41807c0ab3602f6a4602fd25e539f3a101eab87e7edf4c0c0e0
 DIST orca-3.10.3.tar.xz 3842408 SHA256 04c8bdab6fd2d8678f6acb812664ced7c78fe3cd6b4b80531a9b66ae8d2dc0d8 SHA512 a6c7e0a9f7de78fd865183d9d0e6acc77cb907bf2d23841bcc39c9c21489aa3a7fbc82565d887884a0daca835d95a334c72be3ba364a4fa2b4088dda19492f1c WHIRLPOOL 5212086a2f59c7a66387b9ca39f2584dca38825da832841e723836102d2eae3dda494d2df032648ba844c5add8259e4e67f6a70c6c85d2b167bb77da570b18fd
+DIST orca-3.12.1.tar.xz 1949748 SHA256 abcc638021b8290f75a3081c07a732b58dad85d3a5b7f161c31daeeb097889ec SHA512 987b7ad1d829b8b7df9f36ddaecfb1518f5e3eaa5c9edaffcad7d3a2a7e92b6a1618f4ebd05ce4c0adfa4ce1b23b782373c283098c16ae11aa8e1192d67b08f9 WHIRLPOOL 18098ae47a4232eb2f655c5d2035af102a3c58f0b7ab7c561b92af9617d0df6348a24caeb34715662558ff530957bf33d581813568a454cc595481c9d7ae9683

app-accessibility/orca/orca-3.12.1.ebuild

@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.12.1.ebuild,v 1.1 2014/04/27 15:18:30 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_3 )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# liblouis is not in portage yet
+# it is used to provide contracted braille support
+# XXX: Check deps for correctness
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.10:2
+	>=app-accessibility/at-spi2-core-2.10:2[introspection]
+	>=dev-libs/atk-2.10
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure ITSTOOL="$(type -P true)"
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+			-i src/orca/orca || die
+		python_doscript src/orca/orca
+	}
+	python_foreach_impl run_in_build_dir installing
+}

app-admin/hddtemp/files/hddgentoo.db

@@ -75,6 +75,7 @@
 "WDC WD5000AZRX-00A8LB0"                                        194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 64MB"
 "WDC WD7500AZRX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
 "WDC WD10EARS"							194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
+"WDC WD15EARS"							194 C "Western Digital Caviar Green 1.5TB SATA2 IntelliPower 64MB"
 "WDC WD20EARS"							194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
 "WDC WD10EZRX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
 "WDC WD25EZRX"							194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
@@ -198,6 +199,7 @@
 "WDC WD40EZRX"                   				194 C "Western Digital Green 4TB SATA3 IntelliPower 64MB"
 "WDC WD20EARS"                   				194 C "Western Digital Green 2TB SATA2 IntelliPower 64MB"
 "WDC WD5000BEVT"                 				194 C "Western Digital Scorpio Blue 500GB SATA2 5400RPM 8MB"
+"WDC WD5000BPKT-00PK4T0"					194 C "Western Digital Scorpio Black 500GB SATA2 7200RPM 16MB"
 "SanDisk SD6SB1M256G1022I"       				194 C "Sandisk SSD X110 256GB"
 "Hitachi HTS542512K9SA00"					194 C "Hitachi Travelstar 5K250 120GB SATA2 5400RPM 8MB"
 "Hitachi HTS542516K9SA00"					194 C "Hitachi Travelstar 5K250 160GB SATA2 5400RPM 8MB"

app-admin/hddtemp/hddtemp-0.3_beta15-r22.ebuild

@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r22.ebuild,v 1.4 2013/07/08 21:05:57 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="http://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="network-cron nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(README TODO ChangeLog)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-
-	dosbin "${FILESDIR}"/update-hddtemp.db
-
-	if use network-cron ; then
-		exeinto /etc/cron.monthly
-		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
-		newexe "${T}"/hddtemp.cron update-hddtemp.db
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  update-hddtemp.db"
-	elog ""
-	elog "If your hard drive is not recognized by hddtemp, please consider"
-	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
-	elog "database by filing a bug at https://bugs.gentoo.org/"
-	echo
-	ewarn "If hddtemp complains but finds your HDD temperature sensor, use the"
-	ewarn "--quiet option to suppress the warning."
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}

app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild,v 1.1 2013/09/28 08:09:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild,v 1.2 2014/04/27 11:00:47 aidecoe Exp $
 
 EAPI=4
 

app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r23.ebuild,v 1.2 2013/07/08 21:05:57 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild,v 1.1 2014/04/27 11:11:29 aidecoe Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils autotools systemd
 
@@ -54,11 +54,11 @@ src_install() {
 	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
 	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
 	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-	systemd_dounit "${FILESDIR}"/hddtemp.service
+	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
 
-	dosbin "${FILESDIR}"/update-hddtemp.db
+	if use network-cron; then
-
+		dosbin "${FILESDIR}"/update-hddtemp.db
-	if use network-cron ; then
 		exeinto /etc/cron.monthly
 		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
 		newexe "${T}"/hddtemp.cron update-hddtemp.db
@@ -67,7 +67,11 @@ src_install() {
 
 pkg_postinst() {
 	elog "In order to update your hddtemp database, run:"
-	elog "  update-hddtemp.db"
+	if use network-cron; then
+		elog "  update-hddtemp.db"
+	else
+		elog "  emerge --config =${CATEGORY}/${PF}"
+	fi
 	elog ""
 	elog "If your hard drive is not recognized by hddtemp, please consider"
 	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
@@ -91,3 +95,13 @@ update_db() {
 		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
 	done < "${src}"
 }
+
+pkg_config() {
+	cd "${ROOT}"/usr/share/hddtemp || die
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
+		|| die "failed to download hddtemp.db"
+
+	update_db "hddgentoo.db" "hddtemp.db"
+}

app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild

@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r3.ebuild,v 1.14 2013/07/08 21:05:57 aidecoe Exp $
-
-inherit eutils autotools
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="http://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README TODO ChangeLog
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog ""
-	elog "If your hard drive is not recognized by hddtemp, please consider"
-	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
-	elog "database by filing a bug at https://bugs.gentoo.org/"
-	elog ""
-	elog "The hddtemp deamon requires a network interface to be up.  If you"
-	elog "don't have an Ethernet interface, make sure at least the loopback"
-	elog "interface is up by setting 'rc_depend_strict=\"NO\"' in /etc/rc.conf."
-	echo
-	ewarn "If hddtemp complains but finds your HDD temperature sensor, use the"
-	ewarn "--quiet option to suppress the warning."
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-pkg_config() {
-	cd "${ROOT}"/usr/share/hddtemp
-
-	einfo "Trying to download the latest hddtemp.db file"
-	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
-		|| die "failed to download hddtemp.db"
-
-	update_db "hddgentoo.db" "hddtemp.db"
-}

app-admin/hddtemp/hddtemp-0.3_beta15-r5.ebuild

@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r5.ebuild,v 1.4 2013/07/08 21:05:57 aidecoe Exp $
-
-inherit eutils autotools
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="http://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README TODO ChangeLog
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog ""
-	elog "If your hard drive is not recognized by hddtemp, please consider"
-	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
-	elog "database by filing a bug at https://bugs.gentoo.org/"
-	echo
-	ewarn "If hddtemp complains but finds your HDD temperature sensor, use the"
-	ewarn "--quiet option to suppress the warning."
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-pkg_config() {
-	cd "${ROOT}"/usr/share/hddtemp
-
-	einfo "Trying to download the latest hddtemp.db file"
-	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
-		|| die "failed to download hddtemp.db"
-
-	update_db "hddgentoo.db" "hddtemp.db"
-}

app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild,v 1.10 2013/09/06 18:33:17 ago Exp $
-
-inherit eutils autotools systemd
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="http://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="nls"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README TODO ChangeLog
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-	systemd_dounit "${FILESDIR}"/hddtemp.service
-}
-
-pkg_postinst() {
-	elog "In order to update your hddtemp database, run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog ""
-	elog "If your hard drive is not recognized by hddtemp, please consider"
-	elog "submitting your HDD info for inclusion into the Gentoo hddtemp"
-	elog "database by filing a bug at https://bugs.gentoo.org/"
-	echo
-	ewarn "If hddtemp complains but finds your HDD temperature sensor, use the"
-	ewarn "--quiet option to suppress the warning."
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-pkg_config() {
-	cd "${ROOT}"/usr/share/hddtemp
-
-	einfo "Trying to download the latest hddtemp.db file"
-	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
-		|| die "failed to download hddtemp.db"
-
-	update_db "hddgentoo.db" "hddtemp.db"
-}

app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild,v 1.8 2013/12/21 17:16:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild,v 1.9 2014/04/27 11:00:47 aidecoe Exp $
 
 inherit eutils autotools systemd
 

app-admin/system-config-printer-common/system-config-printer-common-1.4.3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.4.3.ebuild,v 1.6 2014/04/26 08:11:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.4.3.ebuild,v 1.7 2014/04/27 11:51:06 maekke Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
 SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 SLOT="0"
 IUSE="doc policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild,v 1.6 2014/04/26 08:13:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.4.3-r1.ebuild,v 1.7 2014/04/27 11:51:32 maekke Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
 SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 SLOT="0"
 IUSE="gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-admin/ulogd/Manifest

@@ -1,2 +1,3 @@
+DIST ulogd-2.0.2.tar.bz2 466664 SHA256 a36c4032d83edaef1b13f96b6647e9e150d7f20b5af7035f0a91c17fe2e066c5 SHA512 a7ac243ec67ab4325855df631bae011284c716495e5e2d26c1f392207448b6b793117124c89b66e7745a05b74cdddb5ed7acb44c34c24618cc27948a25e978df WHIRLPOOL 8113b5e35fe236fbcba8239daf13f435949aa7798f23794e1fc138cd6decc4119da3b06fdda1e3ad6f4c45f0521c44f0e1a50a7bef19644263df1972fedb00d8
 DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
 DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161

app-admin/ulogd/files/ulogd-2.0.2-automagic.patch

@@ -0,0 +1,60 @@
+--- configure.ac.orig	2013-03-01 19:45:23.285968838 +0400
++++ configure.ac	2013-03-15 03:38:50.587620528 +0400
+@@ -20,14 +20,6 @@ AC_PROG_LIBTOOL
+ dnl Checks for libraries.
+ AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+ AC_SUBST([libdl_LIBS])
+-AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+-AC_SUBST([libpcap_LIBS])
+-AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
+-if test "x$libpcap_LIBS" != "x"; then
+-	enable_pcap="yes"
+-else
+-	enable_pcap="no"
+-fi
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+@@ -88,7 +80,10 @@ else
+ 	enable_mysql="no"
+ fi
+ 
+-PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
++AC_ARG_WITH([sqlite], AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin (default: test)]))
++AS_IF([test "x$with_sqlite" != "xno"], [
++    PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
++])
+ AM_CONDITIONAL([HAVE_SQLITE3], [test -n "$libsqlite3_LIBS"])
+ if test "x$libsqlite3_LIBS" != "x"; then
+ 	enable_sqlite3="yes"
+@@ -96,7 +91,10 @@ else
+ 	enable_sqlite3="no"
+ fi
+ 
+-CT_CHECK_DBI()
++AC_ARG_WITH([dbi], AS_HELP_STRING([--without-dbi], [Build without DBI output plugin (default: test)]))
++AS_IF([test "x$with_dbi" != "xno"], [
++    CT_CHECK_DBI()
++])
+ AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x")
+ if test "x$DBI_LIB" != "x"; then
+ 	enable_dbi="yes"
+@@ -104,6 +102,18 @@ else
+ 	enable_dbi="no"
+ fi
+ 
++AC_ARG_WITH([pcap], AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin (default: test)]))
++AS_IF([test "x$with_pcap" != "xno"], [
++    AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
++    AC_SUBST([libpcap_LIBS])
++])
++AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
++if test "x$libpcap_LIBS" != "x"; then
++	enable_pcap="yes"
++else
++	enable_pcap="no"
++fi
++
+ dnl AC_SUBST(DATABASE_DIR)
+ dnl AC_SUBST(DATABASE_LIB)
+ dnl AC_SUBST(DATABASE_LIB_DIR)

app-admin/ulogd/files/ulogd-2.init

@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.3 2014/04/27 09:57:27 hwoarang Exp $
+
+ULOGD_PIDFILE="/run/ulogd.pid"
+ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_OPTS="-u ulogd"
+
+extra_started_commands="reload reopen_logs"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet \
+		--make-pidfile \
+		--pidfile ${ULOGD_PIDFILE} \
+		--background \
+		--exec ${ULOGD_EXEC} \
+		-- ${ULOGD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reopen_logs() {
+	ebegin "Reopening ${SVCNAME} logfiles"
+	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}

app-admin/ulogd/ulogd-2.0.2.ebuild

@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.2.ebuild,v 1.9 2014/04/27 09:57:27 hwoarang Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils linux-info readme.gentoo user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
+
+RDEPEND="net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	>=net-libs/libmnl-1.0.3
+	dbi? ( dev-db/libdbi )
+	nfacct? ( >=net-libs/libnetfilter_acct-1.0.1 )
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+DOCS=( AUTHORS README TODO )
+PATCHES=(
+	# fix automagic support of dbi, pcap and sqlite3 output plugins
+	"${FILESDIR}/${P}-automagic.patch"
+)
+DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
+Please edit example configuration located at /etc/ulogd.conf"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd2 requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+		ewarn
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc ; then
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc ; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}-2.init" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}

app-arch/engrampa/Manifest

@@ -0,0 +1 @@
+DIST engrampa-1.8.0.tar.xz 1357360 SHA256 d802acee43e24b8513e661a91dd7943ebdc55270ed0ceee0a8e29f981f0f6230 SHA512 3be9ba254cefe82e16eb533d5738dacb29e770e30b7a8cc1e62af0476b9b28d90bb86937f559d40eda79116172035c730d8f50053936857587c198461a401eea WHIRLPOOL c625de1156e582f58beed4b04087528e08f1d93de804b022bfc69ed04b12e3c53df92a51534693434d7b3237890d7ee8334a5cd830040b0374aa5f70710ab921

app-arch/engrampa/engrampa-1.8.0.ebuild

@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.1 2014/04/27 15:49:03 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Engrampa archive manager for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="caja"
+
+RDEPEND=">=x11-libs/gtk+-2.21.4:2
+	>=dev-libs/glib-2.25.5:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	>=mate-base/mate-common-1.6:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-packagekit \
+		--disable-deprecations \
+		--with-gtk=2.0 \
+		$(use_enable caja caja-actions)
+}
+
+DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}

app-arch/engrampa/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+	<use>
+		<flag name="caja">Enable engrampa to integrate with
+			<pkg>mate-base/mate-file-manager</pkg> by providing entries in its 
+			context menu</flag>
+	</use>
+</pkgmetadata>

app-arch/file-roller/Manifest

@@ -1,2 +1,3 @@
 DIST file-roller-2.32.2.tar.bz2 1901661 SHA256 3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755 SHA512 c62153871ed0210972d45ed0fa71eb177602cbc48894907c50ff45e8798d07979377ce4cbe1fbc1c37e5762cd005c5846dd9ac9f5ee93fe860de2babdc0933f0 WHIRLPOOL ea0af0538616532fc644f019d133bf5bfff876c95a3998d63ef58b3fa1b5b3d449c29589125ccdaeea18a1c0c1cafb872e996dd2b174b507c2c804d9c73e32dc
 DIST file-roller-3.10.2.1.tar.xz 1392792 SHA256 fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790 SHA512 8b69c2531b3ad729d208c2b140d1dd6dd156cb34f24465a68c5cb7e94337d2ebbbadf9ecc98993565e525c976e64e454df339fdc914d05815b4cd33055aadfca WHIRLPOOL 5550d89d1a447fe1211185597db85eb0b70371faf8e8597225dc23d0f74c9a77eed237f2da0c02db66b8431b1428d88a08116d243eb942b28e50055ba3fbf629
+DIST file-roller-3.12.1.tar.xz 1397404 SHA256 bb35ae0d3542eee59b916b699f86298dfe93379b1769d6ca1980b2db95672481 SHA512 9685d2dbeaa4711fb125b39c69046e04a1779f112dbe795cf1bb948af2bfd3cc148de196250b8dd76e984c2398c56043af1948a42d4b76f1b6b25700d012f542 WHIRLPOOL 1dc6b9fa212863347eeebfa42124a51378311a4b620bd5ccc082f6ea669afe9f8ee975c597f6ae21b08b670322222e7dce7fc60e9a90850b7500cdd32890f3c1

app-arch/file-roller/file-roller-3.12.1.ebuild

@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.12.1.ebuild,v 1.1 2014/04/27 15:21:49 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 readme.gentoo
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="nautilus packagekit"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.9.3:3
+	>=x11-libs/libnotify-0.4.3:=
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+	nautilus? ( >=gnome-base/nautilus-3 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# Use absolute path to GNU tar since star doesn't have the same
+	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
+	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
+
+	# File providing Gentoo package names for various archivers
+	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-static \
+		--disable-debug \
+		--enable-magic \
+		--enable-libarchive \
+		--with-smclient=xsmp \
+		$(use_enable nautilus nautilus-actions) \
+		$(use_enable packagekit) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}

app-cdr/brasero/Manifest

@@ -1,2 +1,3 @@
 DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b SHA512 ebd08f5ff21685a853c9b339b19b51ffe62e6050a6373883dee1266b45b490308ea5a25a1167a1ea48b89ff64625114a95c6a9f5f42d0d6defc2edd9c0295f25 WHIRLPOOL b01b935ac042bfa129c2245b0fb351ef4ed7c18e5e230cdf8a058073aa4fc28e78137f2bbae173784dc48b440153dcf21def3757dcd8f52065b3065bb42aa103
 DIST brasero-3.10.0.tar.xz 3374492 SHA256 88fd9135e796f58caeb484d00f5d95916c67f97505e68d2027ab84d3f9245f37 SHA512 5a9470d983a78f30fb3072cfd4a6c78dc8aeb5a277aacf32cc642282653ed2712cd7dbb1be32e542d0a6029bbfc17a053de5022900a999b202d5dfcdebf64f00 WHIRLPOOL b663e676ae764e835e39c1217435a0a1a0061496bfed6ba3281274c4291e37d84870cd208cc79651ada3dfbcce07f93e3a2ed561239c02ba5bdf0ee09ad45d16
+DIST brasero-3.11.3.tar.xz 3362000 SHA256 0b6fa557d67845b7a4f9978b565a6769e1a023c397a73f2891a8f1c7c55e2d4c SHA512 ac4e5948c27b0925a0ac9ae1a39afbadd7075cb221ea748750b0c1400489a2dac82fc96f317ab82c1243b29346f4ec889f2b0819e7c2459d79bb771dd9129813 WHIRLPOOL 63593dd8fc7b03fab29dfa3e63224012a80310dc909c165bf7cefc7e967f8f1f3cbbfb0c8fbc24fe8ab944814ccebe4915a7ced57ac8a1e5b60e6dff9e403f67

app-cdr/brasero/brasero-3.11.3.ebuild

@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.11.3.ebuild,v 1.1 2014/04/27 15:22:22 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
+HOMEPAGE="http://projects.gnome.org/brasero/"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1:=
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	libburn? (
+		>=dev-libs/libburn-0.4:=
+		>=dev-libs/libisofs-0.6.4:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( >=app-misc/tracker-0.12:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	>=dev-util/gtk-doc-am-1.12
+	gnome-base/gnome-common:3
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.3 )
+"
+# eautoreconf deps
+#	app-text/yelp-tools
+#	gnome-base/gnome-common
+
+PDEPEND="gnome-base/gvfs"
+
+src_prepare() {
+	# Allow building against tracker-1.0
+	sed -e 's/\[0\.18\]\]/[0.18], [1.0]]/' \
+		-i configure.ac || die
+
+	eautoreconf
+	gnome2_src_configure
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search) \
+		ITSTOOL=$(type -P true)
+}

app-cdr/brasero/metadata.xml

@@ -6,10 +6,10 @@
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
-		<flag name='nautilus'>Build the <pkg>gnome-base/nautilus</pkg>
+		<flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
 			extension</flag>
-		<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>
+		<flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag>
-		<flag name='playlist'>Enable support for playlists through
+		<flag name="playlist">Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
 		<flag name="tracker">Enable audio playlist search using the
 			<pkg>app-misc/tracker</pkg> indexer</flag>

app-crypt/gcr/Manifest

@@ -1 +1,2 @@
 DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
+DIST gcr-3.12.0.tar.xz 1335728 SHA256 9d561d0b0a43aaad55fc1d464b3ee3e1687a5021e444f1bbdce3ae624518de77 SHA512 a38a7d084f77bff5b26546bc0bca61e53b0b0a0ae9470a42b61ac12c9a0b755a763171d27d01ffbeda3c04a3d6e9cadc61f5875576d02efacfab112427834990 WHIRLPOOL fc5743c81c4062b79a58c272265f2660be66739796e02eeb241d4340b3f31325fa58c49ed478fa5e9986465e895a1d316850dacfe9a94cc0472cdee0b39c8337

app-crypt/gcr/gcr-3.12.0.ebuild

@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.12.0.ebuild,v 1.1 2014/04/27 15:25:24 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://developer.gnome.org/gcr/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=app-crypt/gnupg-2
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}

app-crypt/libsecret/Manifest

@@ -1 +1,2 @@
 DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183
+DIST libsecret-0.18.tar.xz 480520 SHA256 0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3 SHA512 5b3b460fe45b780fd4018dbb3b5fcc2c2e775725a8c74f4cfa86c00c643ccc1b29961b7e464c7b01846c5cc16a4bb9819c74016dd6758301ae2f67ab947c35bd WHIRLPOOL 2c3cb1a6a902665b3898a211317316d988791648d1d1f7144160f12376b2110ac99e8c3d3423ceb58a8ea0a3fb50efb42fc458aaa44f3aea52d2a1fab2d959a8

app-crypt/libsecret/libsecret-0.18.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.18.ebuild,v 1.1 2014/04/27 15:25:37 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+VALA_MIN_API_VERSION=0.18
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://live.gnome.org/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+IUSE="+crypt debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.29 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-keyring-3
+"
+# Add ksecrets to RDEPEND when it's added to portage
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-python/mock
+		introspection? (
+			${PYTHON_DEPS}
+			>=dev-libs/gjs-1.32
+			dev-python/pygobject:3 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# FIXME: disable failing test
+	sed -e '/test_get_sync);/d' \
+		-e '/test_get_async);/d' \
+		-i libsecret/test-service.c || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}

app-crypt/libsecret/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>gnome</herd>
+	<herd>gnome</herd>
-<use>
+	<use>
-	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-</use>
+	</use>
 </pkgmetadata>

app-crypt/seahorse/Manifest

@@ -1,2 +1,3 @@
 DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d
 DIST seahorse-3.10.2.tar.xz 2109592 SHA256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16 SHA512 7257f96c4e77902c018cfcff9e2096ab216fd4bfde729c08d7305f20e58664675381ad60e394d0536e392345cc6bcfb2de59af1a2a4e3e5ae56856aa8fc0d80c WHIRLPOOL 9c940ac1168b12c19884aff2b8ffbad48b1e0f1aaebca182489722e2c542f54fedafcc17c912b21afff547e4c6b1253c2d8c2a2f2195978b21edef3b055151b8
+DIST seahorse-3.12.0.tar.xz 1396460 SHA256 f78800b1d25b285ddc8928e925f9ee24f27640abba3fc9ab1cd9554c83380d0b SHA512 dad48e51695502b8763aef7918f9b03ccd7d9c3eb335ca44c5c67c3be7be6668559cff7e12ca335e851436a0ca77c62ab2a6fba0873e9fe692d23c460f9dc33c WHIRLPOOL c25af28ce8269d469db82027c1130af2f102b65a6e7393ae6f55fe7c5088a4084b190c7c91f760835a1fdfbab8b7541f7f226cb4742ba0da949866dc49e6bc14

app-crypt/seahorse/seahorse-3.12.0.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.12.0.ebuild,v 1.1 2014/04/27 15:27:43 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="avahi debug ldap"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.11.91:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	|| (
+		=app-crypt/gnupg-2.0*
+		=app-crypt/gnupg-1.4* )
+
+	avahi? ( >=net-dns/avahi-0.6:= )
+	ldap? ( net-nds/openldap:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--enable-hkp \
+		$(use_enable avahi sharing) \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		ITSTOOL=$(type -P true) \
+		VALAC=$(type -P true)
+}

app-editors/bluefish/bluefish-2.2.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.2.ebuild,v 1.9 2012/07/29 16:41:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.2.ebuild,v 1.10 2014/04/26 19:58:36 pacho Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
 HOMEPAGE="http://bluefish.openoffice.nl/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="nls python spell"
 

app-editors/gedit-plugins/Manifest

@@ -1 +1,2 @@
 DIST gedit-plugins-3.10.1.tar.xz 1253800 SHA256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d SHA512 bb63986c1a2c431443191bf1855a54125c9c1b500a4764bf13f597cb8ea09e588ee101d2856938ee229bc9bbba9bd107c60c643fb09f001afa26f0ef90baa2fa WHIRLPOOL d148f654c0b4de0caab3b26ae8334d2ed9344a3b08eed4b45b8458a1f3efd9c909edd8dbf015c951aadaaa0953abe81365324077c81e5d18d1b7c412d148cd46
+DIST gedit-plugins-3.12.1.tar.xz 1291692 SHA256 431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f SHA512 6ed7265b90ed6ef2fcde65a5cec807a6583110b33a1255ed71fa1dd0c3d4ffa9874a5304d9e0f957151cfe0b58cef21b1af842dd066a04c865e5483e98f885a2 WHIRLPOOL a937ea666a9249696d640d1b288bfae526898db961f5fffbd99ebc9e925660081be17e208c7086df5e58c082f5322d3889e0dfb4021cc0b929caf1a937530c74

app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild

@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild,v 1.1 2014/04/27 15:35:32 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 multilib python-r1
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap git terminal"
+IUSE="+python ${IUSE_plugins}"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	terminal? ( python )
+	python? ( ${REQUIRED_PYTHON_USE} )
+"
+
+RDEPEND="
+	>=app-editors/gedit-3.11.3[python?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk,python?]
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-3.9.2:3.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3[introspection,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-3.9.2:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6 )
+	terminal? ( x11-libs/vte:2.90[introspection] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+	find "${ED}"/usr/share/gedit -type d -empty -delete || die
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}

app-editors/gedit-plugins/metadata.xml

@@ -4,9 +4,9 @@
 <herd>gnome</herd>
 <longdescription>Official plugins for gedit</longdescription>
 <use>
-	<flag name='charmap'>Insert special characters just by clicking on
+	<flag name="charmap">Insert special characters just by clicking on
-		  them</flag>
+		them</flag>
 	<flag name='git'>Shows document changes related to git's HEAD</flag>
-	<flag name='terminal'>Embed a terminal in the bottom pane</flag>
+	<flag name="terminal">Embed a terminal in the bottom pane</flag>
 </use>
 </pkgmetadata>

app-editors/gedit/Manifest

@@ -1,2 +1,3 @@
 DIST gedit-2.30.4.tar.bz2 4705692 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c SHA512 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1 WHIRLPOOL fe5183f33992d6ec1ce8365321f829828d6c9606b42a6872e323351ac4bee0c488fb5ed06dda8e1aac4a09be3dbad7196e48d9cccf5d0f1c6dd759224051eca6
 DIST gedit-3.10.4.tar.xz 3086320 SHA256 40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e SHA512 36fe1a309594338e6b0f8285eb8789386724e0a9c9f5f3ff898d138c0949c04ce693896f4e4766666e3afe795dea46caf0403ff82570dfd60e6dc5ccb99642d4 WHIRLPOOL 73c40ae9c73fd31a8dd5468924a338c4e8055c021a9f8800555f781e5bf9d71cfbb9c57666127e52ed3311933a7d0402ca3844b1d8bac439274cf88889c5953d
+DIST gedit-3.12.1.tar.xz 2892392 SHA256 8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f SHA512 68d6ccff930c89415105fdeb888c9a5e7e64a7468741e71b31773640ac818f1d79dda9ba9d7734b0c2cd0f57e383de468351d26a09f6c2eb2ad11981fa743b91 WHIRLPOOL 10ce6fbc264d2cb0056c1d8688062d68eee5005fe1bb7b86c270cd1c1238378ff2c20863c43a0994274f7e6669d75801127de7bf2517e748dc764bb787a12c38

app-editors/gedit/gedit-3.12.1.ebuild

@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.1.ebuild,v 1.1 2014/04/27 15:30:11 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{2,3} )
+
+inherit eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell zeitgeist"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.39.5:2
+	>=x11-libs/gtk+-3.11.6:3[introspection?]
+	>=x11-libs/gtksourceview-3.11.2:3.0[introspection?]
+	>=dev-libs/libpeas-1.7.0[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-0.9.3
+		>=x11-libs/gtk+-3:3[introspection]
+		>=x11-libs/gtksourceview-3.6:3.0[introspection]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
+	spell? (
+		>=app-text/enchant-1.2:=
+		>=app-text/iso-codes-0.35 )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+src_prepare() {
+	# FIXME: Not able to set some metadata
+	sed -e '/g_test_add_func/d' \
+		-i tests/document-loader.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_enable spell) \
+		$(use_enable zeitgeist) \
+		ITSTOOL=$(type -P true)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}

app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.4 2014/04/25 13:15:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.5 2014/04/27 11:42:37 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? ( virtual/latex-base )"

app-emulation/vmware-workstation/files/vmware-10.0.rc

@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $
 
 depend() {
 	need localmount
@@ -14,7 +14,9 @@ start() {
 	@@BINDIR@@/vmware-usbarbitrator 
 	eend $?
 	ebegin Starting VMware services
-	modprobe -a vmmon vmci vsock vmblock vmnet 
+	modprobe -v vmci || modprobe -v vmw_vmci
+	eend $?
+	modprobe -av vmmon vmci vsock vmblock vmnet 
 	eend $?
 	@@BINDIR@@/vmware-networks --start
 	eend $?
@@ -28,6 +30,8 @@ stop() {
 	@@BINDIR@@/vmware-networks --stop 
 	eend $?
 	ebegin Stopping VMware services
-	modprobe -r vsock vmci vmmon vmblock vmnet
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	modprobe -rv vmci || modprobe -rv vmw_vmci
 	eend $?
 }

app-emulation/vmware-workstation/files/vmware-9.0.rc

@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc,v 1.1 2012/12/09 14:30:38 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $
 
 depend() {
 	need localmount
@@ -14,7 +14,9 @@ start() {
 	@@BINDIR@@/vmware-usbarbitrator 
 	eend $?
 	ebegin Starting VMware services
-	modprobe -a vmmon vmci vsock vmblock vmnet 
+	modprobe -v vmci || modprobe -v vmw_vmci
+	eend $?
+	modprobe -av vmmon vmci vsock vmblock vmnet 
 	eend $?
 	@@BINDIR@@/vmware-networks --start
 	eend $?
@@ -28,6 +30,8 @@ stop() {
 	@@BINDIR@@/vmware-networks --stop 
 	eend $?
 	ebegin Stopping VMware services
-	modprobe -r vsock vmci vmmon vmblock vmnet
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	modprobe -rv vmci || modprobe -rv vmw_vmci
 	eend $?
 }

app-emulation/vmware-workstation/files/vmware-server-8.0.rc

@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-8.0.rc,v 1.1 2011/12/03 20:14:02 vadimk Exp $
-
-depend() {
-	need localmount vmware
-	use net
-}
-
-checkconfig() {
-	# Check if certificates exist.  If not, we need to generate them, ala sshd.
-	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
-		mkdir -p @@ETCDIR@@/ssl
-		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
-		chmod -R 600 @@ETCDIR@@/ssl
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin Starting VMware Authentication Daemon
-	start-stop-daemon --start \
-	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd \
-	  -- -a -d @@ETCDIR@@/hostd/config.xml
-
-	eend $?
-}
-
-stop() {
-	ebegin "Shutdown VMs in the AutoStart Sequence"
-	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
-
-	if [ "x" != "x${HOHO_ADMIN}" ]; then
-		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
-	fi
-	eend $?
-
-	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd 
-	eend $?
-	ebegin Stopping VMware Authentication Daemon
-	#start-stop-daemon --stop \
-	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	killall @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-}

app-misc/bijiben/Manifest

@@ -1 +1,2 @@
 DIST bijiben-3.10.2.tar.xz 540948 SHA256 81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4 SHA512 55193caaa9a3920075b21e1ac57bca12f99114f204d14eee3f91afa13a8faeb7f393136d1e9acb69031d3229c8371998a514898507dc4425c9fa49995e84b6c9 WHIRLPOOL ae161e8530c8044c7ae3342fe713e0ecd34c7d23c09f22635dd908211492cbbdd25a2c4bddc54708bf03f02fd33ea328f994f920bcebce8879bf562448023d0b
+DIST bijiben-3.12.0.tar.xz 639916 SHA256 03377f99f71920d3e94c7772f5b7a2aad067878f01d295715fd00b57f3732f26 SHA512 bc54618e3de830bab735fb646994d211dbe6b2216ef0d6e0d100a1687807e458b292c1b84610c49628d7ae46f270d0a67e9740a948a14021eca6917339449bf5 WHIRLPOOL 88fff17089384e15e1074acaea5185d51a5a6fb7497a0eca4be2360a311cb235827fba51745947844e7712158ed5a842e5015a9d6f316df6f453a9b78fbf887f

app-misc/bijiben/bijiben-3.12.0.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bijiben/bijiben-3.12.0.ebuild,v 1.1 2014/04/27 15:32:18 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="http://live.gnome.org/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# zeitgeist is optional but automagic
+RDEPEND="
+	>=app-misc/tracker-1:=
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2
+	gnome-extra/zeitgeist
+	media-libs/clutter-gtk:1.0
+	net-libs/gnome-online-accounts
+	net-libs/webkit-gtk:3
+	sys-apps/util-linux
+	>=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure ITSTOOL="$(type -P true)"
+}

app-misc/geoclue/Manifest

@@ -1,2 +1,3 @@
 DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
 DIST geoclue-2.0.0.tar.xz 284592 SHA256 4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1 SHA512 35f25e4491dccb94029ebdf15b9b7864ac8fe79287f091b4b94c65767af2dc4b464e075728eb4db76cecffba330772e31e25c442285bf29a8dea0836aca586a6 WHIRLPOOL 3501bf39e38f0cb09ae3bc193b636ec223ca1874e6458414f02945933f3a7a83e0bdee960c7b33ec65e8863f4b88677023a22bf06af8ec41fc6cc2aaa5d35aac
+DIST geoclue-2.1.8.tar.xz 321012 SHA256 d5ccc0898f46fb15efcae5615d56cefcca46cf775a53baebee5d3f1082000116 SHA512 b32439d30d2616fde9b60592fb2be172341cfdd6ccd6604813b8975d4f2e41f9984a08f548207f1ec32d877297a39e02187b2a332d8a4048873b7aef852e3b0b WHIRLPOOL 9f4e9105f8cafe93c7d8f401b81b3e18d9807eb04894b5b637aef7c861ed78b72ac6bc831078b887c2c2931c632cb8bc0c00e594cc33b0ed16ac74a6d22d2307

app-misc/geoclue/geoclue-2.1.8.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.8.ebuild,v 1.1 2014/04/27 15:42:09 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+modemmanager +networkmanager"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.14
+	>=dev-libs/libxml2-2.7:2
+	net-libs/libsoup:2.4
+	sys-apps/dbus
+	modemmanager? ( >=net-misc/modemmanager-1 )
+	networkmanager? ( >=net-misc/networkmanager-0.9.8 )
+	!<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--with-dbus-service-user=geoclue \
+		$(use_enable modemmanager 3g-source) \
+		$(use_enable modemmanager modem-gps-source) \
+		$(use_enable networkmanager network-manager) \
+		$(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}

app-misc/geoclue/metadata.xml

@@ -9,6 +9,7 @@
     <flag name="gtk">Install gtk-based geoclue-test-gui</flag>
     <flag name="hostip">Install hostip.info provder</flag>
     <flag name="manual">Install manual provider</flag>
+    <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
     <flag name="nominatim">Install openstreetmap.org provider</flag>
     <flag name="plazes">Install plazes.com provider</flag>
     <flag name="server">Install geoip server</flag>

app-misc/gnote/Manifest

@@ -1 +1,2 @@
 DIST gnote-3.10.3.tar.xz 3047920 SHA256 02e3c60dc49f3b040d86f0bb8c86af563dec91fcae1037bfda05a33a2cb8c5fd SHA512 9bb4ad2167bdcfcdb2df9f81b7e13863dc511ad0608f5f6601802a001cdb8cf37e43cc278c335bde13879e61700c43eeb63442f6c9435c47791d978f9cb6218f WHIRLPOOL 4f3b3e1658cc3f0a7e9c0043bede5007375a5914296faff772662d0ae9779ffc3386f5e862ef91d07be714c4d47b71518a43c99d5b9aeab4675a6fe1ae613df5
+DIST gnote-3.12.0.tar.xz 3078416 SHA256 b76e13e6793d3e73adafaca20063ba9fea23dae67022597c69c81c1f61842d6c SHA512 558aedcaab4874208ee7aca0fa01124b1bb4bbdb43cb0e39e9b434381441a0c38c909fb7a186805ee98c2f59c107c709d6dea34e02e7493c069f9c29e733168e WHIRLPOOL ae22f3e29f975073b5a03abf7b94928df6c971423a8b0269d6c76e2c1507b9f4259ea73e2ae3be9830e86ca1e5583ef5a42f667606693fedfd6c10bcc186325b

app-misc/gnote/gnote-3.12.0.ebuild

@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.12.0.ebuild,v 1.1 2014/04/27 15:48:21 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +X"
+
+# Automagic glib-2.32 dep
+COMMON_DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gtkspell-3.0:3
+	>=dev-cpp/glibmm-2.32:2
+	>=dev-cpp/gtkmm-3.10:3.0
+	>=dev-libs/boost-1.34
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.10:3
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_with X x11-support) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}

app-misc/gnote/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>

app-misc/tracker/Manifest

@@ -1 +1,2 @@
 DIST tracker-0.16.4.tar.xz 5745592 SHA256 9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580 SHA512 82cc63f5a89e70e5d7d3c306005c9119b7f52a244cc453b789f19f56ec4858fd4c02421e07ab392dc1198b3352e99022986dfff043f9b4757e59723c038ffda0 WHIRLPOOL 07ec3cb39f619b930fba194c8cb5843786d9b0afa0d759498f72b35305ad06e1b9aba53fee64dad73186d74b7207c80ffa892adc9b5b350a108d882eaead9d9a
+DIST tracker-1.0.0.tar.xz 6172700 SHA256 a1d033faf2c78f0e239f3c2c961b96623c9a7dabd938c08e3f5660bd70f54ba2 SHA512 0a0e452e84d2746f3e340f25ffb2f09c91927a4c0cf2953bba65f21fc8e42add0cacae331bb184346b115fbafcc6f9c93421872daf10df0bf2663981ac5c51d4 WHIRLPOOL 7d2ae59efe46fea6b978d13f6ef0e42cdf0706b238ffa9f3484742e12beaf9506346e7fdf38325c97dbf17c866b1848aa69dd542f6691a4f8fa343f2aee2b319

app-misc/tracker/tracker-1.0.0.ebuild

@@ -0,0 +1,256 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.0.ebuild,v 1.1 2014/04/27 15:53:15 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+VALA_MIN_API_VERSION="0.14"
+
+inherit autotools gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://projects.gnome.org/tracker/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/100"
+IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	?? ( gstreamer ffmpeg )
+	cue? ( gstreamer )
+	upnp-av? ( gstreamer )
+	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"
+
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7.16:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.9.5
+	>=dev-libs/icu-4.8.1.1:=
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/libmediaart-0.1:1.0
+	>=x11-libs/pango-1:=
+	sys-apps/util-linux
+
+	cue? ( media-libs/libcue )
+	eds? (
+		>=mail-client/evolution-3.3.5:=
+		>=gnome-extra/evolution-data-server-3.3.5:=
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
+	elibc_glibc? ( >=sys-libs/glibc-2.12 )
+	exif? ( >=media-libs/libexif-0.6 )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	firefox-bookmarks? ( || (
+		>=www-client/firefox-4.0
+		>=www-client/firefox-bin-4.0 ) )
+	flac? ( >=media-libs/flac-1.2.1 )
+	gif? ( media-libs/giflib )
+	gsf? ( >=gnome-extra/libgsf-1.14.24 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	gtk? (
+		>=dev-libs/libgee-0.3:0.8
+		>=x11-libs/gtk+-3:3 )
+	iptc? ( media-libs/libiptcdata )
+	iso? ( >=sys-libs/libosinfo-0.2.9:= )
+	jpeg? ( virtual/jpeg:0 )
+	laptop? ( >=sys-power/upower-0.9 )
+	mp3? ( >=media-libs/taglib-1.6 )
+	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-3 )
+	rss? ( net-libs/libgrss:0.5 )
+	thunderbird? ( || (
+		>=mail-client/thunderbird-5.0
+		>=mail-client/thunderbird-bin-5.0 ) )
+	tiff? ( media-libs/tiff )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )
+	xps? ( app-text/libgxps )
+	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	>=dev-util/gtk-doc-am-1.8
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk? ( >=dev-libs/libgee-0.3 )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+# configure mixes enable-compile-warnings and with-compile-warnings
+# See upstream bug #705315
+QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
+
+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
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# 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
+
+	# Skip broken tests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
+	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
+		-i tests/libtracker-common/tracker-file-utils-test.c || die
+	# Fails inside portage, not outside
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
+	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
+		-i tests/tracker-steroids/tracker-test.c || die
+
+	eautoreconf # See bug #367975
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if use gstreamer ; then
+		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
+		if use upnp-av; then
+			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
+		else
+			myconf="${myconf} --with-gstreamer-backend=discoverer"
+		fi
+	elif use ffmpeg ; then
+		myconf="${myconf} --enable-generic-media-extractor=libav"
+	else
+		myconf="${myconf} --enable-generic-media-extractor=external"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	# According to NEWS, introspection is required
+	# is not being generated
+	# nautilus extension is in a separate package, nautilus-tracker-tags
+	gnome2_src_configure \
+		--disable-hal \
+		--disable-nautilus-extension \
+		--enable-abiword \
+		--enable-artwork \
+		--enable-dvi \
+		--enable-icon \
+		--enable-ps \
+		--enable-text \
+		--enable-guarantee-metadata \
+		--enable-introspection \
+		--enable-libpng \
+		--enable-libmediaart \
+		--enable-tracker-fts \
+		--with-enca \
+		--with-unicode-support=libicu \
+		$(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 gif libgif) \
+		$(use_enable gsf libgsf) \
+		$(use_enable gtk tracker-needle) \
+		$(use_enable gtk tracker-preferences) \
+		$(use_enable iptc libiptcdata) \
+		$(use_enable iso libosinfo) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable laptop upower) \
+		$(use_enable miner-fs) \
+		$(use_enable mp3 taglib) \
+		$(use_enable mp3) \
+		$(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 xps libgxps) \
+		${myconf}
+}
+
+src_test() {
+	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
+	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
+}

app-portage/portage-utils/portage-utils-0.53.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.53.ebuild,v 1.1 2014/03/22 05:31:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.53.ebuild,v 1.2 2014/04/26 21:32:12 vapier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils"

app-shells/bash/bash-4.3_p11-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p11.ebuild,v 1.2 2014/04/14 16:50:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p11-r2.ebuild,v 1.1 2014/04/26 20:14:20 polynomial-c Exp $
 
 EAPI="4"
 
@@ -83,6 +83,9 @@ src_prepare() {
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/*
 
+	epatch "${FILESDIR}"/${PN}-4.3-jobs-run-sigchld-trap.patch \
+		"${FILESDIR}"/${PN}-4.3-complete-dequoting.patch
+
 	epatch_user
 }
 

app-shells/bash/files/bash-4.3-complete-dequoting.patch

@@ -0,0 +1,26 @@
+*** ../bash-4.3-patched/bashline.c	2014-02-09 19:56:58.000000000 -0500
+--- bashline.c	2014-04-25 14:57:52.000000000 -0400
+***************
+*** 4168,4174 ****
+  
+    qc = rl_dispatching ? rl_completion_quote_character : 0;  
+!   dfn = bash_dequote_filename ((char *)text, qc);
+    m1 = rl_completion_matches (dfn, rl_filename_completion_function);
+!   free (dfn);
+  
+    if (m1 == 0 || m1[0] == 0)
+--- 4209,4222 ----
+  
+    qc = rl_dispatching ? rl_completion_quote_character : 0;  
+!   /* If rl_completion_found_quote != 0, rl_completion_matches will call the
+!      filename dequoting function, causing the directory name to be dequoted
+!      twice. */
+!   if (rl_dispatching && rl_completion_found_quote == 0)
+!     dfn = bash_dequote_filename ((char *)text, qc);
+!   else
+!     dfn = (char *)text;
+    m1 = rl_completion_matches (dfn, rl_filename_completion_function);
+!   if (dfn != text)
+!     free (dfn);
+  
+    if (m1 == 0 || m1[0] == 0)

app-text/evince/Manifest

@@ -1,2 +1,3 @@
 DIST evince-2.32.0.tar.bz2 2295272 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 SHA512 b478f3199d017ba77b75e9d0ee9a82469b58087fea18eb30ff17ee8f03189e842299b8f4df412d4bb6d0ee985ed76bcbd8dfb3accc13b824232980f5a10e0a3c WHIRLPOOL de4892107c83601fb59aaf848acb0ab3d977759f0532221023ea5370706471ef8704d3f28df135d20214f7677f1d3328f9e6b0d4f49277983059626b185cf1c2
 DIST evince-3.10.3.tar.xz 6470572 SHA256 b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af SHA512 bd5884d45aece4bf5369a548c0b9a59a06aedc885ef9dab2668cdc7a82dec417d949f2369c5ef66d773bfe814d30b95f1aeb824bdaf91a39fcd550b4d25fff8c WHIRLPOOL a8080b6ba03cdc83ada474acab6b031307db058a44ce6fbbe50b2d3c622fb6030eeab0dabd31a733375f3d2912e44fc51d5f671dcfc8d853e4212e8498d663bb
+DIST evince-3.12.1.tar.xz 2910936 SHA256 ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137 SHA512 f95c6f0db920870d45ed63666dd09f0d3c96362fb02e3dcb38658e279b00a204841d967fd10dd4a0ee403740ae9fcef203bfd042bdf87ac83b7fad821cfc91de WHIRLPOOL 23c33181d40f17e26d1f9b7d025f6288771df5b6227f48e758125bac5f63a9952f429c839eb9e7b20d5d987415933eb16b8a252741b37979e2c5517a834fd8f1

app-text/evince/evince-3.12.1.ebuild

@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.12.1.ebuild,v 1.1 2014/04/27 15:48:32 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="http://www.gnome.org/projects/evince/"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="debug djvu dvi +introspection libsecret nautilus +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.8:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.24:=[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
+# Releases: http://people.redhat.com/zcerza/dogtail/releases/
+RESTRICT="test"
+
+src_prepare() {
+	# ???
+	ELTCONF="--portage"
+
+	gnome2_src_prepare
+
+	# Do not depend on gnome-icon-theme, bug #326855, #391859
+	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tests \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with libsecret keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		ITSTOOL=$(type -P true)
+}

app-text/evince/metadata.xml

@@ -4,12 +4,12 @@
 	<herd>gnome</herd>
 	<use>
 		<flag name="gnome">Enable the use of <pkg>gnome-base/gconf</pkg> to honour
-		lockdown settings</flag>
+			lockdown settings</flag>
 		<flag name="dvi">Enable the built-in DVI viewer</flag>
 		<flag name="libsecret">Enable support for credentials store</flag>
 		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
-    (<pkg>media-libs/t1lib</pkg>)</flag>
+			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
 	</use>
 </pkgmetadata>

app-text/poppler/Manifest

@@ -1 +1,2 @@
 DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
+DIST poppler-0.26.0.tar.xz 1591180 SHA256 8547032fc8ff34ba5f47b47eddfe67d0f2ff0ffcdcf5d189f52dc516770c621f SHA512 a1f0177f4e0403cfe11cad9573bebafff4ceca69519610823dbab51a60f6f2722cd86d20c4f3d26b405027548fe8efecc7f90905a943592176306ecf7cc0ad1a WHIRLPOOL b177afc5869be3097d42f7787a0e54fc12650eda869da3f015f2d65f2958165eab9d5d6e3dc6e535cc841ca9b4ff5fd303ce1f4dc0de64750756b9e4ac1469ba

app-text/poppler/poppler-0.26.0.ebuild

@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.0.ebuild,v 1.1 2014/04/27 13:08:38 dilfridge Exp $
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/46"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+src_configure() {
+	# this is needed for multilib, see bug 459394
+	local ft_libdir ft_includedir
+	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
+	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
+	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
+	einfo "Detected FreeType at ${FREETYPE_DIR}"
+
+	mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use cairo && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}

app-text/qpdf/qpdf-5.1.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.1.ebuild,v 1.2 2014/04/25 13:06:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.1.ebuild,v 1.3 2014/04/27 11:52:07 maekke Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0/13" # subslot = libqpdf soname version
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/libpcre

app-text/yelp-tools/Manifest

@@ -1 +1,2 @@
 DIST yelp-tools-3.10.0.tar.xz 198036 SHA256 ff5e1102631049b08e3ef0ade2cd10e63a62a812690e3d8558ed1413baef2611 SHA512 169552c7a5b6d7854feaec0d1d0698ba7ceb0369324335f2adeb74a45d727e11b3d8b2d666cc46819a7a8ca7015c6ec57980d3e2b7ef784a5fa110ad9584324e WHIRLPOOL 38e8666f60968504a6ca4480dc29f71f7f813bed7c6fe3d0f34502ea6a6b1e4cc4d5e7b4b454f10de39c02d0aa91ee2d5f43acc204ed511bef865fce6b1d8709
+DIST yelp-tools-3.12.1.tar.xz 202816 SHA256 7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172 SHA512 205e3394267cd2e987069400c7507f546cbc75953b080d8dd22915a660288b7f073a996026fb1c383ac108da23a1682a8c30a009cf5038128a52796bb95cd9cd WHIRLPOOL e13b9dc99d8d8abf2bb3ef0babe0d00b756542bc5c0fc5407cd685f7650124731043d186cf0a754bc3a53060de3b541bdb3d18a03ffcbd68fa9cf96958d3e0cf

app-text/yelp-tools/yelp-tools-3.12.1.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.12.1.ebuild,v 1.1 2014/04/27 15:50:50 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	gnome-extra/yelp-xsl
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"

app-vim/slimv/slimv-0.9.12.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/slimv/slimv-0.9.12.ebuild,v 1.2 2014/04/12 19:48:51 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/slimv/slimv-0.9.12.ebuild,v 1.3 2014/04/26 18:53:00 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2531"
 SRC_URI="https://bitbucket.org/kovisoft/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
 	>=dev-lang/python-2.4

app-vim/tagbar/tagbar-2.6.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/tagbar/tagbar-2.6.1.ebuild,v 1.2 2014/04/12 18:54:49 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/tagbar/tagbar-2.6.1.ebuild,v 1.3 2014/04/26 18:53:13 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://majutsushi.github.com/tagbar/
 	http://www.vim.org/scripts/script.php?script_id=3465"
 SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-util/ctags-5.5"
 

dev-cpp/glibmm/Manifest

@@ -1 +1,2 @@
 DIST glibmm-2.38.1.tar.xz 5701316 SHA256 49c925ee1d3c4d0d6cd7492d7173bd6826db51d0b55f458a6496406ae267c4a2 SHA512 f9f9b71cfc0f810452669a497eb215c1073fc9b9d63f94adb575d1e3cf8c11412378ae717c7425220a80e96f44095445290536e9667730b1dfc91624cfd263ba WHIRLPOOL eecbbd4812665c4d1330ed3f7dd73165966e4790a1e22d3f741e60cbc236c1fc25da796d9c1a18f6533d46c08dd35ee897cbd5e28e3d1367e97118fc476c39c2
+DIST glibmm-2.38.2.tar.xz 5598460 SHA256 908127c8128403d7813ae54fdc1ce026a842df0743b8eecca369e9411e702665 SHA512 7cb6d4be7e695e29ff78e2e2495c6c4605d1a6f6d213951a27dac79dfa1c145dd79ced4d034a195b66905ab1b21c3a034682bc48c9ccb472dd40022ba5050a65 WHIRLPOOL 6a5c3a512fe41bc4712df4ffe38c8db9671afb4c04f06c8311fc3852f071b10fa58a6350dfb2aa26a8b372bb15405725cdfe3d6323c09d1adfb4c51185f6689a

dev-cpp/glibmm/glibmm-2.38.2.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.38.2.ebuild,v 1.1 2014/04/27 10:31:46 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug examples test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.2.10:2
+	>=dev-libs/glib-2.38.0:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building examples
+		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+src_test() {
+	cd "${S}/tests/"
+	default
+
+	for i in */test; do
+		${i} || die "Running tests failed at ${i}"
+	done
+}
+
+src_install() {
+	gnome2_src_install
+
+	if ! use doc && ! use examples; then
+		rm -fr "${ED}usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc -r examples
+	fi
+}

dev-cpp/gtkmm/Manifest

@@ -1,2 +1,3 @@
 DIST gtkmm-2.24.4.tar.xz 10262212 SHA256 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee SHA512 75d8c7a7c32adb33a9867b36877422bce52d8486d66be5aaa2afe1eee439efc2ba09aab7d06b9986d74879103415062c5386d5354aff6d44a63b2ba2d75f7c89 WHIRLPOOL 06074ec3f2f7adfe1f24b4d629ef73e852a9b21d719f2705f254389802813b53625be0be4aa30e191df134609b8349ea0725afcf858d26c0bf18282dd8358ab0
 DIST gtkmm-3.10.1.tar.xz 10294092 SHA256 6fa5cdaa5cf386ea7c77fafed47e913afadd48fe45e28d8cb01075c3ee412538 SHA512 7718d0aebdc2d8c19c1cb1f7e461a6eb39bfbde54e5950c81d6f0d94bb6bd636ae3e0d75b8f9e4826335f6a29989569c5e3e80aa6d9a52e9852faadbfbf6a708 WHIRLPOOL e23ae9c3629a91986183a998fcbb6c68cb367301808d895b97cb73148604423108992cb2b45d8d92b9d52dc6257c08b587c06263419ebdb6deaa925526e0542d
+DIST gtkmm-3.12.0.tar.xz 10113956 SHA256 86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1 SHA512 a412fca2adc0b35c6f282ce091587a66f255a27fe294b0f064083a4c2b621bf0b44999e4967dd3ed21bb07bd5dc27e312dafa1d6c20ed976a01e0a7a558b5fad WHIRLPOOL c59c2bc5e34463a599aa71462d8635c83ee763bc9cc3fd702d99f8341a2db3e86934d543f86c57fd967af6a964cf41b1c94562e4b556a97e0d80949b3857d432

dev-cpp/gtkmm/gtkmm-3.12.0.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.12.0.ebuild,v 1.1 2014/04/27 16:13:05 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aqua doc examples test wayland +X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.38.0:2
+	>=x11-libs/gtk+-3.12:3[aqua?,wayland?,X?]
+	>=x11-libs/gdk-pixbuf-2.26:2
+	>=dev-cpp/atkmm-2.22.2
+	>=dev-cpp/cairomm-1.9.2.2
+	>=dev-cpp/pangomm-2.27.1:1.4
+	dev-libs/libsigc++:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+#	dev-cpp/mm-common"
+# eautoreconf needs mm-common
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	gnome2_src_configure \
+		--enable-api-atkmm \
+		$(use_enable doc documentation) \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend)
+}

dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild,v 1.6 2012/07/21 14:39:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild,v 1.7 2014/04/27 09:34:15 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2 eutils
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="http://projects.gnome.org/gtksourceviewmm/"
 
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 SLOT="3.0"
 LICENSE="LGPL-2.1"

dev-java/commons-el/commons-el-1.0-r3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r3.ebuild,v 1.2 2014/04/25 09:40:19 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r3.ebuild,v 1.3 2014/04/26 18:53:27 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="

dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch

@@ -0,0 +1,32 @@
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2014-03-18 10:35:50.904133661 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-18 10:37:03.808131298 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig	2014-03-18 10:37:12.048131031 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-18 10:37:58.416129528 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"

dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.9 2013/03/02 19:55:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.10 2014/04/27 14:18:30 tomwij Exp $
 
 EAPI=4
 
@@ -63,6 +63,10 @@ RDEPEND=">=virtual/jre-1.5
 
 S=${WORKDIR}/${MY_P}
 
+java_prepare() {
+	epatch "${FILESDIR}"/${PF}-freetype-2.5.3-support.patch
+}
+
 src_configure() {
 	# We require ecj anyway, so force it to avoid problems with bad versions of javac
 	export JAVAC="${EPREFIX}/usr/bin/ecj"

dev-java/java-gnome/Manifest

@@ -1,5 +1,3 @@
-DIST java-gnome-4.0.18.tar.bz2 1045240 SHA256 2f606fda2d89961cfbbddc7f391a35302078030a5391699e3bc44b6972b3928d SHA512 9198ccf91e6fceab6e7ad4ef27e7c7699837ff4f0e193006d5056ed4095f2e34ccbb199de107fa31278f983e93534f01269efeaa8af2f11379e5d9989b8d7acb WHIRLPOOL 52de1758a123ad07a4425b8428fed8861d40286b19fa1e4244d4ba1176ae18d4cc8768b61d97eb2c4604f5949a770674c92af9893f04b480c22042ac806edaf0
 DIST java-gnome-4.0.19.tar.bz2 1048049 SHA256 3954ee78277918a32aa80b35cfc1892f3b21af4a6956d9e53e1f0e980512bd9b SHA512 da59fb69e0ab0547f9cb0979c16a16514ee512ed0a44a52689727d5d2ed1744a69650b8a9f3e9d5f3abdeec158a5f6b6af0326a394c7a4c96bad91c6f90903f1 WHIRLPOOL a4201f55950655d8d4ea5f5908c331bad140f7dcd9a710684d372a370800f88716d2066d06d15bb9d996e04948b4d32e477efba51cbec79dfc763d2f7755850d
 DIST java-gnome-4.0.20.tar.bz2 1053511 SHA256 2f2e1e97076507026e8bfca45183d30667fcd064177c4914d1b071923227c813 SHA512 8769d48b7dcb76487951b99df05dc04487098ccafb144779e53da2e5e934edbb18964053505750056f78b7117d2ab54538ab493c1a38bf82d9530fdcdfc52a85 WHIRLPOOL 0c20628780e16e64eb3d7728b3f10716144a1268b9ebd612bede3c1eef89f28d4f9b11c5c5d68ac68cb8cfa01e83f2bdc55b1b7bc05ce76e6c7085c453b89a1b
-DIST java-gnome-4.1.1.tar.bz2 1035554 SHA256 b3f0a3e90c85c5dc5480db1511d04e9aed1fa3b16a689857ba510e35820170d1 SHA512 83ef29568adac0525848c6e321acec8be235579c5b4a2998886665b6a3e5358e85213a04d48f0649f4d1da01f547eeccf1d4130a729832e96d62c0952613f0f0 WHIRLPOOL a99b25df0937dc04e5d5815f3a645c01697bc72bab0d3ea4c1f96517a791d350c3017b6ba8401df1b623363844ada0aaef6c913b592c6925051df8fea0c78ddb
 DIST java-gnome-4.1.3.tar.xz 989568 SHA256 060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373 SHA512 06f9468f59b5d7ac09fd9542b808c8bf7af5099df925b00f2b27d1dc515f1c15ea93b1fd8166bfa46eed143f6759fec360a8c3be3a5edb08d28901687493bd0a WHIRLPOOL aed0b93d138fd70ec6b0b62875346353ca11394f62ecfdd7b1a795010431fc7f84df58c1c66edb824be5c340e406b4882ffe5201f64a3c2ef80fb6d4d1ae689f

dev-java/java-gnome/java-gnome-4.0.18-r2.ebuild

@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18-r2.ebuild,v 1.4 2012/05/03 07:42:51 jdhore Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 multilib
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java bindings for GTK and GNOME"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	>=x11-libs/gtk+-2.22.0:2
-	>=gnome-base/libglade-2.6.4
-	>=gnome-base/libgnome-2.22.0
-	>=gnome-base/gnome-desktop-2.22.0:2
-	>=x11-libs/cairo-1.10.0[svg]
-	>=x11-libs/gtksourceview-2.6.2:2.0
-	>=app-text/gtkspell-2.0.15-r1:2
-	>=x11-libs/libnotify-0.4.5
-	>=dev-libs/libunique-1.0.8:1
-	>=gnome-base/librsvg-2.32.1
-	>=virtual/jre-1.5"
-DEPEND="${RDEPEND}
-	dev-java/junit:0
-	dev-lang/perl
-	virtual/pkgconfig
-	>=virtual/jdk-1.5"
-
-# Needs X11
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	#fix dependency typo in configure
-	sed -i -e "s/librsvg-2.0atk/librsvg-2.0 atk/" configure || die
-	if has_version ">=x11-libs/libnotify-0.7"; then
-		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	fi
-}
-
-src_configure() {
-	# Handwritten in perl so not using econf
-	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
-}
-
-src_compile() {
-	# Fails parallel build in case GCJ is detected
-	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
-	emake -j1 || die "Compilation of java-gnome failed"
-
-	if use doc; then
-		DISPLAY= emake -j1 doc || die "Making documentation failed"
-	fi
-}
-
-src_install(){
-	emake -j1 DESTDIR="${D}" install || die
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
-
-	dodoc AUTHORS HACKING NEWS README || die
-	use doc && java-pkg_dojavadoc doc/api
-	use examples && java-pkg_doexamples doc/examples
-	use source && java-pkg_dosrc src/bindings/org
-}

dev-java/java-gnome/java-gnome-4.0.19-r1.ebuild

@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.19-r1.ebuild,v 1.1 2012/05/04 16:09:26 sera Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc examples source"
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils versionator java-pkg-2 multilib python
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java bindings for GTK and GNOME"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	>=x11-libs/gtk+-2.22.0:2
-	>=gnome-base/libglade-2.6.4
-	>=gnome-base/libgnome-2.22.0
-	>=gnome-base/gnome-desktop-2.22.0:2
-	>=x11-libs/cairo-1.10.0[svg]
-	>=x11-libs/gtksourceview-2.6.2:2.0
-	>=app-text/gtkspell-2.0.15-r1:2
-	>=x11-libs/libnotify-0.4.5
-	>=dev-libs/libunique-1.0.8:1
-	>=gnome-base/librsvg-2.32.1
-	dev-libs/atk
-	>=virtual/jre-1.5"
-DEPEND="${RDEPEND}
-	dev-java/junit:0
-	dev-lang/perl
-	virtual/pkgconfig
-	>=virtual/jdk-1.5"
-
-# Needs X11
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2 #390103
-	python_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-java_prepare() {
-	if has_version ">=x11-libs/libnotify-0.7"; then
-		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	fi
-}
-
-src_configure() {
-	# Handwritten in perl so not using econf
-	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
-}
-
-src_compile() {
-	# Fails parallel build in case GCJ is detected
-	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
-	emake -j1 || die "Compilation of java-gnome failed"
-
-	if use doc; then
-		DISPLAY= emake -j1 doc || die "Making documentation failed"
-	fi
-}
-
-src_install(){
-	emake -j1 DESTDIR="${D}" install || die
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
-
-	dodoc AUTHORS HACKING NEWS README || die
-	use doc && java-pkg_dojavadoc doc/api
-	use examples && java-pkg_doexamples doc/examples
-	use source && java-pkg_dosrc src/bindings/org
-}

dev-java/java-gnome/java-gnome-4.1.1.ebuild

@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.1.1.ebuild,v 1.1 2012/05/04 16:09:26 sera Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc examples source"
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils versionator java-pkg-2 multilib python virtualx
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java bindings for GTK and GNOME"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="4.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEP="
-	app-text/enchant:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.28:2
-	dev-libs/libunique:3
-	gnome-base/librsvg:2
-	>=x11-libs/cairo-1.10.0[svg]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7.0
-	x11-libs/pango:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	dev-java/junit:0
-	dev-lang/perl
-	>=virtual/jdk-1.5
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2 #390103
-	python_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_configure() {
-	# Handwritten in perl so not using econf
-	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
-}
-
-src_compile() {
-	emake
-	use doc && DISPLAY= emake doc
-}
-
-# Needs X11, fails even then
-RESTRICT="test"
-src_test() {
-	Xemake test
-}
-
-src_install(){
-	emake -j1  DESTDIR="${D}" install || die
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
-	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
-
-	dodoc AUTHORS HACKING NEWS README || die
-	use doc && java-pkg_dojavadoc doc/api
-	use examples && java-pkg_doexamples doc/examples
-	use source && java-pkg_dosrc src/bindings/org
-}

dev-java/java-gnome/java-gnome-4.1.3.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.1.3.ebuild,v 1.4 2013/09/30 17:15:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.1.3.ebuild,v 1.5 2014/04/27 09:36:07 pacho Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.1"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 COMMON_DEP="
 	app-text/enchant:0

dev-lang/vala/Manifest

@@ -1,3 +1,4 @@
 DIST vala-0.18.1.tar.xz 2584924 SHA256 7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32 SHA512 e4459738b916d6b70c633844db3e0b0fed0f186d3f44cd3e4cac3c486a7d8b7a4bb0f58620b8b0c367f61bf6358a6b511edf924533eb8bb2ee49ac36069ee4db WHIRLPOOL 5d2907f175e3460def1f271be4db099d0d8d92e34739f893210302af7cc059cbcfb58d735b1fceaea2e905cda107d0a627b9071df285b768a5d7c9c7334a020e
 DIST vala-0.20.1.tar.xz 2627808 SHA256 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481 SHA512 6246228815bcc042de0aeea3f4593c95b0d81fdfec8a4336a8e9178dd8a4a7013694a2cec543c3c49aad026d5d3597e194884b6cfecb10040db886afba9e72e1 WHIRLPOOL 91a7017c1801ebe29f5f9704b98e9bc65d26bb66122ef25f684da43dee116a2da5c9d7a91a1f73c5a7a580c9c8e5515f024a2b8ad615ae367faf37bef022f905
 DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c SHA512 e65f6d368d50264cdd497251ca6ebf8f0be21455afe5b9d74b146d58229f32e5906cfe323cef2cf4c6677e01fcbf599ab98852d4930df89cb69740b8fffacb34 WHIRLPOOL d3252642b35ab619f3b08dbda3ab4ef201b665c55682e122b4ffd1e5138d60a38b017ae20140de31372c9f61f20532a7a04d77f8cfe5ae04f93ea1c55338e09a
+DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f

dev-lang/vala/vala-0.24.0.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.24.0.ebuild,v 1.1 2014/04/27 11:19:59 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test +vapigen"
+
+RDEPEND="
+	>=dev-libs/glib-2.18:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2 )
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable vapigen)
+}

dev-libs/atk/Manifest

@@ -1 +1,2 @@
 DIST atk-2.10.0.tar.xz 642336 SHA256 636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0 SHA512 923905b05fb4a9c64a708fc98e7248ec65829ae9b3c2250bb8ed91f2572ca1c7c75a4fd7777e6c8c4f147eb0b330df76a5609ff73b10fda86f72d2a312a669e3 WHIRLPOOL 471d057719588e4c1e1eec016d2bf0cbfea3b5939b938c1a163ce4ee27dceaf903457ee5effa29cdd48390aa5b0001bfca2b8e406a77732d165824c48001dc4e
+DIST atk-2.12.0.tar.xz 688716 SHA256 48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f SHA512 422f0f4ef5f29707e77065557516a218ff23e78f61fa8e8c78b4a528c06cfeaff934e67eaaec00dc82cd13b2869e30618883a53010bd828dbebe51baea848272 WHIRLPOOL 2fda41b10a3890e7f097756da5aa3d502a0017ab82abbd67f72835b55240c9d23d53521e5632e0e287cc8c1e17598635c3385ca5362c4e1c42bcbc52c97db984

dev-libs/atk/atk-2.12.0.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.12.0.ebuild,v 1.1 2014/04/27 16:00:03 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+introspection nls test"
+
+RDEPEND="
+	>=dev-libs/glib-2.31.2:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if ! use test; then
+		# don't waste time building tests (bug #226353)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable introspection)
+}

dev-libs/folks/folks-0.9.6-r1.ebuild

@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.6-r1.ebuild,v 1.1 2014/04/27 16:02:25 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://live.gnome.org/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+# TODO: --enable-profiling
+# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
+IUSE="bluetooth eds socialweb +telepathy test tracker utils zeitgeist"
+REQUIRED_USE="bluetooth? ( eds )"
+
+COMMON_DEPEND="
+	$(vala_depend)
+	>=dev-libs/glib-2.38.2:2
+	dev-libs/dbus-glib
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	dev-libs/libxml2
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	bluetooth? ( >=net-wireless/bluez-5 )
+	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
+	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
+	tracker? ( >=app-misc/tracker-1:0= )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${COMMON_DEPEND}
+	net-im/telepathy-mission-control
+"
+# folks socialweb backend requires that libsocialweb be built with USE=vala,
+# even when building folks with --disable-vala.
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/gobject-introspection-1.30
+	>=dev-util/intltool-0.50.0
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
+	test? ( sys-apps/dbus )
+	!<dev-lang/vala-0.22.1:0.22
+"
+
+src_prepare() {
+	# Allow building against tracker-1.0
+	sed -e 's/\(TRACKER_SPARQL_MAJOR\)=0.16/\1=1.0/' \
+		-i configure{.ac,} || die
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Rebuilding docs needs valadoc, which has no release
+	gnome2_src_configure \
+		$(use_enable bluetooth bluez-backend) \
+		$(use_enable eds eds-backend) \
+		$(use_enable eds ofono-backend) \
+		$(use_enable socialweb libsocialweb-backend) \
+		$(use_enable telepathy telepathy-backend) \
+		$(use_enable tracker tracker-backend) \
+		$(use_enable utils inspect-tool) \
+		$(use_enable test tests) \
+		$(use_enable zeitgeist) \
+		--enable-vala \
+		--enable-import-tool \
+		--disable-docs \
+		--disable-fatal-warnings
+}
+
+src_test() {
+	dbus-launch Xemake check
+}

dev-libs/gdl/Manifest

@@ -1 +1,2 @@
 DIST gdl-3.10.0.tar.xz 526704 SHA256 4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760 SHA512 0df36abc91d1bb9fb2cdfc2eea0c755fbe406693b6e848350b0297fb96fac3f1932c6804b2c240140ba88529b69c229a6fc3446f67bd7686f32b8918916d4943 WHIRLPOOL 05ea5ce442b5a3579366f4b15b43778d67edd1e3e18a6098c1b0a28ef1505cdff8b223241f3ec8f1b01dc455da58e419e8b395041c7ec4965a11b349e1cb6994
+DIST gdl-3.12.0.tar.xz 527944 SHA256 4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d SHA512 caa7c942ebfaeadce112110e74bb7117f0c0fe17a9d0d2bc19330bd413223bafe2b824e0e3c6caa2263a7f2e832e1c2d5b84eeaf2e9cfed99ce3ab8e9f10837e WHIRLPOOL c4197dd8234e14a590bf9ba4ef4427678990ca086d1776fdd6ccae4c4c42e14c7bcd02044da8e93f30dcd6b5600b8f12e71fa58fe8e51ad8ddddbd25062c0971

dev-libs/gdl/gdl-3.12.0.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.12.0.ebuild,v 1.1 2014/04/27 16:04:09 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GNOME docking library"
+HOMEPAGE="https://developer.gnome.org/gdl/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3/5" # subslot = libgdl-3 soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=dev-libs/libxml2-2.4:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure $(use_enable introspection)
+}

dev-libs/gjs/Manifest

@@ -1,2 +1,3 @@
 DIST gjs-1.36.1.tar.xz 404664 SHA256 d259ef2d702fa9cc9948a35d0e701706d90798fd2855657b7e9ddc9a44dfcf87 SHA512 a2110d957f4179927d649b1da712bec7cc19cfeca48093712b7b3e8d81c06ae39752e2cbdec392c05d74343c98259af4b8c9f54448933e7e6143d9f963cfdd89 WHIRLPOOL 02676a5689d01a416775bd3cae50764f045f924c13024e289bc830ce38474585b4868aa758c5584ae715d2fba1422f6db7a92b2e5852117cb2711959d8ae6f0c
 DIST gjs-1.38.1.tar.xz 421160 SHA256 6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176 SHA512 2747c3803a1508c065d4c57ccd8a44e50ef4149393b89e88a2ece97e10b3f0e831c041a2d5b198c1eea25146d7252b4f221703b0145d8181ff591d25ab7e5512 WHIRLPOOL 5d052cc072b8c24807c5445665cde5942972b34f3345f7d0f99e09d9c018df34f64243a85215fb287762e08f11cc36fa9e4e4746c55dbd5e3cbe20cecfaa3c6d
+DIST gjs-1.40.1.tar.xz 448204 SHA256 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793 SHA512 c3da112bed3bc97d93913df6284e7616a5893abc6db0fd0bef79c8d0594c9ae85ada61f7c262839d20905dc7ca31a8ac3d5319863aaaff1c69c0d834629d78eb WHIRLPOOL 54da01eeb63d7955150c674394911ff38ccf216c262e89a162455bd21f69fe64a36bca50bffc288c2eb2e90c543d2e41128169f686f7f06523d9fb786166b2dd

dev-libs/gjs/gjs-1.40.1.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.40.1.ebuild,v 1.1 2014/04/27 16:14:19 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="http://live.gnome.org/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.39.3
+
+	sys-libs/readline
+	dev-lang/spidermonkey:24
+	virtual/libffi
+	cairo? ( x11-libs/cairo )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# Large amount of tests are broken even in master.
+RESTRICT="test"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}

dev-libs/glib/Manifest

@@ -1,4 +1,5 @@
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
+DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486

dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch

@@ -0,0 +1,95 @@
+diff --git a/configure.ac b/configure.ac
+index a01e58d..59d4527 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-            AS_HELP_STRING([--with-python=PATH],
+-                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
+-            [PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AC_ARG_WITH(python,
++#             AS_HELP_STRING([--with-python=PATH],
++#                            [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
++#             [PYTHON="$withval"], [])
++# if test x"$PYTHON" = xyes; then
++#   AC_MSG_ERROR([--with-python option requires a path or program argument])
++# fi
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+ 
+ 
+ dnl ***********************
+@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 47fdd38..c7eb136 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -157,8 +157,7 @@ man_MANS +=			\
+ 	glib-compile-resources.1	\
+ 	gsettings.1		\
+ 	gresource.1		\
+-	gdbus.1			\
+-	gdbus-codegen.1
++	gdbus.1
+ 
+ XSLTPROC_FLAGS = \
+         --nonet \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index e993e2f..025ad94 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 2c54e59..3cd3c5a 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -437,10 +437,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.project. \
+ 		--generate-c-code gdbus-test-codegen-generated \
+ 		--c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index d6d1412..62ef706 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
+ 	$(NULL)
+ 
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ 		--c-namespace Example \
+ 		--c-generate-object-manager \

dev-libs/glib/glib-2.40.0.ebuild

@@ -0,0 +1,269 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.1 2014/04/27 16:17:10 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+# Avoid runtime dependency on python when USE=test
+
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	virtual/libffi[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/elfutils-0.142
+		>=dev-libs/libelf-0.8.12
+		>=sys-freebsd/freebsd-lib-9.2_rc1
+		)
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
+	!<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="x11-misc/shared-mime-info
+	!<gnome-base/gvfs-1.6.4-r990"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# Earlier versions of gvfs do not work with glib
+
+DOCS="AUTHORS ChangeLog* NEWS* README"
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+			export IPV6_DISABLED="yes"
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	if use test; then
+		# Do not try to remove files on live filesystem, upstream bug #619274
+		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+		fi
+
+		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+	fi
+
+	# thread test fails, upstream bug #679306
+	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	# Gentoo handles completions in a different directory
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		gio/Makefile.am || die
+
+	# Support compilation in clang until upstream solves this, upstream bug #691608
+	append-flags -Wno-format-nonliteral
+
+	epatch_user
+
+	# Needed for the punt-python-check patch, disabling timeout test
+	# Also needed to prevent cross-compile failures, see bug #267603
+	# Also needed for the no-gdbus-codegen patch
+	eautoreconf
+
+	# FIXME: Really needed when running eautoreconf before? bug#????
+	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	use debug && myconf="--enable-debug"
+
+	# Only used by the gresource bin
+	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+	# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+	if multilib_is_native_abi; then
+		myconf="${myconf} $(use_enable selinux)"
+	else
+		myconf="${myconf} --disable-selinux"
+	fi
+
+	# Always use internal libpcre, bug #254659
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	prune_libtool_files --modules
+}
+
+multilib_src_test() {
+	gnome2_environment_reset
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	unset GSETTINGS_BACKEND # bug 352451
+	export LC_TIME=C # bug #411967
+	python_export_best
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+pkg_postinst() {
+	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+		# a warning instead of a blocker
+		ewarn
+		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+	fi
+}

dev-libs/gobject-introspection-common/Manifest

@@ -1 +1,2 @@
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78

dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild,v 1.1 2014/04/27 16:18:18 eva Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="gobject-introspection"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for GObject Introspection"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# http://forums.gentoo.org/viewtopic-p-7421930.html
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/aclocal
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	dodir /usr/share/gobject-introspection-1.0
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}

dev-libs/gobject-introspection/Manifest

@@ -1 +1,2 @@
 DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78

dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild

@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild,v 1.1 2014/04/27 16:20:12 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC=$(tc-getCC) \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}