Sync with portage [Thu Feb 7 10:16:30 MSK 2013].

app-admin/webmin/Manifest

@@ -1,4 +1,2 @@
-DIST webmin-1.600-minimal.tar.gz 2432340 SHA256 6ffbd63da362638784b2b45ca2f3b46e89b78a868b8d0eb1c73499bcdb90207f SHA512 8fb4cbed2dcc85a0542ee5035637fe05abf45a90e53600112d31353725aef026f513063ea44341639d4d820e0f9336c58b955d490558927b999013b476710268 WHIRLPOOL 5c231e4cc28a985235b8eb8c62ec69e94e03797d9bb818e506c9f112bb1f7c8ff59dc28d10c43019b06f5ad214f30d05ccc967261274bc62a385ddea348ffff3
-DIST webmin-1.600.tar.gz 21397348 SHA256 a45ddad342e9a3b9263f45749ec1d440e0702645c6297310701e988f5f1c74a9 SHA512 bd73ba2ed6df9ed7c6e336ea07571ca17f552f1d41ffda2f78ea00f43e31e4652a9afc8877addc5cd2bdcfebae1d787294601f17cfc43db78c3682a6200fe0d6 WHIRLPOOL f27abf2ec43a9cc6f04ea4ab019628a83e3f305ebfa27a435787167289c92a4f4a0cf9464e7cdd18e37b59846fb10e8dd64dd46f318c3421369dd51e0b95c391
-DIST webmin-1.610-minimal.tar.gz 2433278 SHA256 43fdf50662ae423e4903e0c671198918f45e314c0813e1b072e4c85b8a920789 SHA512 9dc932e312b083f4dd87099c0b7a61c46107ce634e8e67b34a83c396b6f81697a45128f72fe9a7d8112ccfb02bf3456c3d949934af95be5ab36942ebf5eaf263 WHIRLPOOL a803b6e04613056c105c690c81d7987b88821b33de23f00c38fa26fcd387076f682c323f96803037ac612afea02b84b75592c709845e1304b069504f3d2a8e00
-DIST webmin-1.610.tar.gz 21526599 SHA256 6393a2a33040951b17bb2d3e663b2a54f921e0f7b74ec49f4997dcd74f8a8d6e SHA512 72a363425f227144d988d9b95bcd43ce06db9fde8cb0638266e3cd429cfe74fe92f19f573c1a23194ec95ad36fd12bf9d324abcc4d174abfa05a689b98b91340 WHIRLPOOL f575ad5cc36edb8f71c39cc60075ae732239601c9e66e8c0fbbf3b9835fa12b0179ec0c075b668d867ab8a84ed8afc97d1b73bc48639126d10182f8cf8dafb3b
+DIST webmin-1.620-minimal.tar.gz 2440850 SHA256 51d75ce76a9038357dec4fbf74069aca1b003bb1e64c7339626cb28ce42fd834 SHA512 099c5197eba2ad205c4aad785fe21c4bc4994be1e70c75157dc0f59fb3292b912b16a0a81ef6e147eb9dd7506a445ab5e677935e1c13449599744d90b8d0d52f WHIRLPOOL d88fa9ccdefdf9d7f9d981225da4f47ef50f0cc976c9691ebae362f974942f26ffca6a43c5b0da50a18937c44a4c23b60228e2155611274aca78f6724db61614
+DIST webmin-1.620.tar.gz 21646366 SHA256 3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b SHA512 18fcf5dcee161b71b927a7fb5acffe5c655376982989d4f92a08c296186b40b1c185bde83df2cc670eaf6efa8070d73fb39755f94309347e040e8e5edde12312 WHIRLPOOL 6cdcc8855998d1f1f2482d43765894584445bc1f75f2606e39ed7569522891af6ec2c260dcfb0a2a0350cff8a4b21964b3a91edceb49278963f2b71df1211633

app-admin/webmin/files/gentoo-setup

@@ -1,5 +1,8 @@
 #!/bin/sh
 # gentoo-setup.sh
+#
+# Version 1.1
+#
 # A modified original Webmin setup.sh script to comply with Gentoo specifics
 #
 # Modification done by: PhobosK <phobosk@kbfx.net>
@@ -91,10 +94,11 @@ if [ "$upgrading" = 1 ]; then
 	real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
 	real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
 
-	# Get port, ssl, ssl_redirect and keyfile
+	# Get port, ssl, ssl_redirect, no_sslcompression and keyfile
 	port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
 	ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
 	ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
+	no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
 	keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
 
 	# Update ACLs
@@ -136,6 +140,7 @@ else
 	echo "ppath=$ppath" >> $cfile
 	echo "ssl=$ssl" >> $cfile
 	echo "ssl_redirect=$ssl_redirect" >> $cfile
+	echo "no_sslcompression=$no_sslcompression" >> $cfile
 	echo "keyfile=$keyfile" >> $cfile
 	echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
 	echo "env_WEBMIN_VAR=$var_dir" >> $cfile
@@ -277,6 +282,12 @@ if [ "$?" != "0" ]; then
 	echo passwd_mode=0 >> $config_dir/miniserv.conf
 fi
 
+# Disable SSL compression to defeat BEAST attack
+grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_sslcompression=1 >> $config_dir/miniserv.conf
+fi
+
 # Make Perl crypt MD5 the default
 echo md5pass=1 >> $config_dir/config
 

app-admin/webmin/files/webmin-1.600-SA51201.patch

@@ -1,105 +0,0 @@
-diff -ur a/passwd/edit_passwd.cgi b/passwd/edit_passwd.cgi
---- a/passwd/edit_passwd.cgi	2012-09-21 21:07:11.000000000 +0300
-+++ b/passwd/edit_passwd.cgi	2012-11-01 19:00:02.000000000 +0200
-@@ -19,7 +19,7 @@
- %uconfig = &foreign_config("useradmin");
- $user[6] =~ s/,.*$// if ($uconfig{'extra_real'});
- print &ui_table_row($text{'passwd_for'},
--	$user[0].( $user[6] ? " ($user[6])" : "" ));
-+	&html_escape($user[0].( $user[6] ? " ($user[6])" : "" )));
- 
- # Old password field
- if ($access{'old'} == 1 ||
-diff -ur a/passwd/index.cgi b/passwd/index.cgi
---- a/passwd/index.cgi	2012-09-21 21:07:11.000000000 +0300
-+++ b/passwd/index.cgi	2012-11-01 19:00:02.000000000 +0200
-@@ -85,7 +85,7 @@
- 	@grid = ( );
- 	for($i=0; $i<@ulist; $i++) {
- 		push(@grid, "<a href=\"edit_passwd.cgi?".
--			    "user=$ulist[$i]->[0]\">".
-+			    "user=".&urlize($ulist[$i]->[0])."\">".
- 			    &html_escape($ulist[$i]->[0])."</a>");
- 		}
- 	print &ui_grid_table(\@grid, 4, 100, undef, undef,
-diff -ur a/passwd/module.info b/passwd/module.info
---- a/passwd/module.info	2012-09-21 21:11:10.000000000 +0300
-+++ b/passwd/module.info	2012-11-01 19:00:02.000000000 +0200
-@@ -1,48 +1,38 @@
--desc_pt_BR=Alterar Senha
--desc_ca=Canvi de Contrasenyes
--desc_it=Cambio Password
--desc_hu.UTF-8=Jelszavak
--readonly=1
--desc=Change Passwords
- category=system
--desc_ja_JP.euc=¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹
--desc_zh_TW.Big5=Åܧó±K½X
--desc_ko_KR.UTF-8=암호 변경
--desc_fi=Vaihda Salasanoja
-+depends=useradmin
-+desc=Change Passwords
-+desc_pl=Zmiany hase³
-+desc_hu=Jelszavak
- name=Passwd
--desc_tr=Parolalarý Deðiþtir
--os_support=!windows
-+desc_ca=Canvi de Contrasenyes
- desc_de=Passw&#246;rter &#228;ndern  
--desc_af=Verander Wagwoord
--desc_sk=Zmena hesla
--desc_pl.UTF-8=Zmiany haseł
--desc_cz.UTF-8=Změna hesla
--desc_ja_JP.UTF-8=パスワードã<E280B0>®å¤‰æ›´
--desc_fr=Changez le Mot de Passe
--desc_pl=Zmiany hase³
-+desc_nl=Wachtwoorden Wijzigen
-+desc_zh_TW.Big5=Åܧó±K½X
- desc_es=Cambio de Contrase&#241;as
--desc_ru_RU=Ïàðîëè
- desc_no=Passord administrasjon
--desc_cz=Zmìna hesla
--desc_ms=Menukar Katalaluan
--desc_nl=Wachtwoorden Wijzigen
--desc_sk.UTF-8=Zmena hesla
--desc_hu=Jelszavak
--desc_zh_TW.UTF-8=變更密碼
--version=1.600
--longdesc=Change the password of any user on the system.
-+desc_af=Verander Wagwoord
-+desc_it=Cambio Password
- desc_ru_SU=ðÁÒÏÌÉ
-+desc_ru_RU=Ïàðîëè
- passwd=Change the passwords of Unix users.
-+longdesc=Change the password of any user on the system.
-+desc_pt_BR=Alterar Senha
-+desc_ms=Menukar Katalaluan
-+desc_cz=Zmìna hesla
-+desc_sk=Zmena hesla
-+desc_tr=Parolalarý Deðiþtir
-+readonly=1
-+os_support=!windows
-+desc_zh_TW.UTF-8=變更密碼
-+desc_fi=Vaihda Salasanoja
- desc_ko_KR.euc=¾ÏÈ£ º¯°æ
-+desc_ko_KR.UTF-8=암호 변경
-+desc_ja_JP.euc=¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹
-+desc_ja_JP.UTF-8=パスワードã<E280B0>®å¤‰æ›´
- desc_ru.UTF-8=Пароли
--depends=useradmin 1.600
--desc_de.UTF-8=Passw&#246;rter &#228;ndern  
--desc_fi.UTF-8=Vaihda Salasanoja
--desc_af.UTF-8=Verander Wagwoord
--desc_fr.UTF-8=Changez le Mot de Passe
--desc_ms.UTF-8=Menukar Katalaluan
--desc_it.UTF-8=Cambio Password
--desc_es.UTF-8=Cambio de Contrase&#241;as
--desc_ca.UTF-8=Canvi de Contrasenyes
--desc_pt_BR.UTF-8=Alterar Senha
--desc_nl.UTF-8=Wachtwoorden Wijzigen
-+desc_fr=Changez le Mot de Passe
-+desc_hu.UTF-8=Jelszavak
-+desc_cz.UTF-8=Změna hesla
-+desc_pl.UTF-8=Zmiany haseł
-+desc_sk.UTF-8=Zmena hesla
-+version=1.605

app-admin/webmin/webmin-1.610.ebuild

@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.610.ebuild,v 1.1 2012/12/05 18:57:25 hwoarang Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postrm() {
-	ewarn
-	ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-	ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-	ewarn "To fix this just disable them if you intend to use Webmin again,"
-	ewarn "OR delete them if not."
-	ewarn
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl' and 'ssl_redirect' for tightening security
-	export ssl=1
-	export ssl_redirect=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}

app-admin/webmin/webmin-1.620.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600-r1.ebuild,v 1.2 2012/11/07 18:51:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.620.ebuild,v 1.1 2013/02/06 20:13:50 hwoarang Exp $
 
 EAPI="3"
 
@@ -54,9 +54,6 @@ src_prepare() {
 		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
 		rm -f mount/{free,net,open}bsd-mounts*
 		rm -f mount/macos-mounts*
-
-		# Fix security bug - https://bugs.gentoo.org/show_bug.cgi?id=441840
-		epatch "${FILESDIR}/${P}-SA51201.patch"
 	fi
 
 	# For security reasons remove the SSL certificate that comes with Webmin
@@ -67,6 +64,9 @@ src_prepare() {
 	# We will use our own later
 	rm -f setup.{sh,pl}
 
+	# Set the installation type/mode to Gentoo
+	echo "gentoo" > install-type
+
 	# Fix the permissions of the install files
 	chmod -R og-w "${S}"
 
@@ -253,9 +253,10 @@ pkg_config(){
 	export os_version='*'
 	export real_os_type='Gentoo Linux'
 	export real_os_version='Any version'
-	# Forcing 'ssl' and 'ssl_redirect' for tightening security
+	# Forcing 'ssl', 'ssl_redirect' and 'no_sslcompression' for tightening security
 	export ssl=1
 	export ssl_redirect=1
+	export no_sslcompression=1
 	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
 	export port=10000
 

app-arch/freeze/freeze-2.5.0.ebuild

@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0.ebuild,v 1.22 2012/12/12 16:14:01 jer Exp $
-
-EAPI="2"
-inherit toolchain-funcs
-
-DESCRIPTION="Freeze/unfreeze compression program"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/compress/"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/compress/${P}.tar.gz"
-
-LICENSE="GPL-1+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	!<=media-libs/mlt-0.4.2
-	!>=app-forensics/sleuthkit-4.0.1
-	!media-libs/mlt[melt]
-"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	# Hard links confuse prepman and these links are absolute.
-	# Fix pre-stripped binary and respect CFLAGS as well
-	sed -i -e 's:ln -f:ln -sf:g' \
-		-e 's:-strip $@::g' \
-		-e '/^CFLAGS/s:=.*:+= -I.:' \
-		Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-		OPTIONS="-DDEFFILE=\\\"/etc/freeze.cnf\\\"" \
-		|| die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	make install \
-		DEST="${D}/usr/bin" \
-		MANDEST="${D}/usr/share/man/man1" \
-		|| die
-	dobin showhuf || die
-	dodoc README *.lsm
-}

app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.10 2013/01/29 22:55:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.11 2013/02/06 19:38:40 ago Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
 IUSE="cuda custom-cflags -minimal mmx mpi opencl openmp sse2"
 REQUIRED_USE="openmp? ( !minimal )

app-crypt/pgpdump/pgpdump-0.27.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.27.ebuild,v 1.4 2012/11/17 10:27:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.27.ebuild,v 1.5 2013/02/06 19:50:21 ago Exp $
 
 EAPI="3"
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib

app-editors/efte/efte-1.1.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/efte/efte-1.1.ebuild,v 1.1 2010/05/01 22:56:10 hanno Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A fast text editor supporting folding, syntax highlighting, etc."
-HOMEPAGE="http://efte.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gpm X"
-
-RDEPEND="sys-libs/ncurses
-	gpm? ( sys-libs/gpm )
-	X? (
-		x11-libs/libXpm
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		media-fonts/font-misc-misc
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_build gpm)
-		$(cmake-utils_use_build X)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}/usr/share/doc/${PN}/COPYING"
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-}

app-emulation/wine/wine-1.2.3.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.21 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.22 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic multilib
 
@@ -22,7 +22,7 @@ fi
 
 pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; }
 GV="1.0.0-x86"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}.cab )
@@ -38,7 +38,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	openal? ( app-emulation/emul-linux-x86-sdl )
@@ -52,12 +52,12 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
 	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
 	jack? ( media-sound/jack-audio-connection-kit )
-	openal? ( media-libs/openal )
+	openal? ( media-libs/openal:= )
 	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	X? (
 		x11-libs/libXcursor
 		x11-libs/libXrandr
@@ -68,22 +68,22 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.3.28.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.14 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.15 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic multilib
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.3"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -50,12 +50,12 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -66,23 +66,23 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.4.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.8 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.9 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.4.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.ebuild,v 1.12 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.ebuild,v 1.13 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.0.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.0.ebuild,v 1.10 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.0.ebuild,v 1.11 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.1.ebuild,v 1.9 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.1.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.10-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -77,27 +77,27 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.11-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -77,27 +77,27 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.12-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -77,27 +77,27 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.13-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -77,27 +77,27 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.14-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.14-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.14-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -77,27 +77,27 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.15-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r2.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r2.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.8"
 MV="0.0.4"
 PULSE_PATCHES="winepulse-patches-1.5.15"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -78,19 +78,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -99,9 +99,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.16-r1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.16-r1.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.16-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -78,19 +78,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -99,9 +99,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.17.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.17.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.17.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -43,7 +43,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -58,15 +58,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -78,19 +78,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -99,9 +99,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.18.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.18.ebuild,v 1.3 2013/01/20 02:27:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.18.ebuild,v 1.4 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
 
@@ -45,7 +45,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -60,15 +60,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -80,19 +80,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -101,9 +101,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.19.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.19.ebuild,v 1.3 2013/01/20 02:27:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.19.ebuild,v 1.4 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
 
@@ -45,7 +45,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -60,15 +60,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -80,19 +80,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -101,9 +101,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.2.ebuild,v 1.9 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.2.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.20.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.5 2013/01/20 02:27:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.6 2013/02/06 05:51:38 tetromino Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )

app-emulation/wine/wine-1.5.21.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.21.ebuild,v 1.2 2013/01/20 02:27:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.21.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )

app-emulation/wine/wine-1.5.22.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.22.ebuild,v 1.1 2013/01/20 02:27:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.22.ebuild,v 1.2 2013/02/06 05:51:38 tetromino Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )

app-emulation/wine/wine-1.5.23-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.2 2013/02/05 15:24:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )

app-emulation/wine/wine-1.5.3.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.3.ebuild,v 1.9 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.3.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.4.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.4.ebuild,v 1.7 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.4.ebuild,v 1.8 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.5.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.5.ebuild,v 1.7 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.5.ebuild,v 1.8 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -19,7 +19,7 @@ else
 fi
 
 GV="1.5"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -51,15 +51,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -70,25 +70,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.6.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.6.ebuild,v 1.6 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.6.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -20,7 +20,7 @@ fi
 
 GV="1.5"
 MV="0.0.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -54,15 +54,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:0
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -73,25 +73,25 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.7.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.7.ebuild,v 1.6 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.7.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.6"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -42,7 +42,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -56,15 +56,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -75,26 +75,26 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.8.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.8.ebuild,v 1.6 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.8.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.6"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -42,7 +42,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -56,15 +56,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -75,26 +75,26 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-1.5.9.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.9.ebuild,v 1.6 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.9.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils flag-o-matic multilib pax-utils
 
@@ -21,7 +21,7 @@ fi
 GV="1.6"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
 	gecko? (
@@ -42,7 +42,7 @@ MLIB_DEPS="amd64? (
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
 	odbc? ( app-emulation/emul-linux-x86-db )
@@ -56,15 +56,15 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
 	udisks? (
 		sys-apps/dbus
 		sys-fs/udisks:2
 	)
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 	X? (
 		x11-libs/libXcursor
@@ -75,26 +75,26 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	opencl? ( virtual/opencl )
 	opengl? (
 		virtual/glu
 		virtual/opengl
 	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
+	gsm? ( media-sound/gsm:= )
+	jpeg? ( virtual/jpeg:= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
+	scanner? ( media-gfx/sane-backends:= )
+	ssl? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )

app-emulation/wine/wine-9999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.132 2013/02/05 15:24:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.133 2013/02/06 05:51:38 tetromino Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ MLIB_DEPS="amd64? (
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )

app-i18n/poedit/Manifest

@@ -1 +1,2 @@
 DIST poedit-1.4.6.1.tar.gz 1585949 SHA256 68d9b374280b02c16a82684d247d4766c4c4a9262324381f443c1678959d8242 SHA512 c8084c80a75cc8499615d736ee6d1a1fcf5753ab610f2931c151167c5c5b2fccff5892e971a90bc53eae815074d209c9e3b5854cc05bed8d72e8f0c2f00b96ed WHIRLPOOL 86484e70aea17770d23ed7baea02626a1a00a1f443bb44cd5f1432989b867515e5ffc2c4aa2d1740289c0c8d0ec17ca08a033ab367b4918b5db70ea627b37880
+DIST poedit-1.5.5.tar.gz 2594758 SHA256 3c94c9825c11a2d1ce10e083ad246e8625469f358da4a5a2f6210170b970f949 SHA512 a3524e27681dbf97babef7bf3ec56d6b7cd736370f8ed86b53c717a5a2eb36245f9ed89fcd28b57bd4d6f5ff5fb98d6c1615baae0bf10be720dcfdafa57ad4f4 WHIRLPOOL 893795acc85183cede0313b9220179cafa17a92033e8472e48454475f4ecdf51a014dc7123e9396a38a98217c43666919e7a1dadf68ab2f401b920071cec3d23

app-i18n/poedit/files/poedit-1.5.5-wx28.patch

@@ -0,0 +1,22 @@
+catalog.cpp:1155:20: error: 'class wxCharBuffer' has no member named 'length'
+
+http://www.poedit.net/trac/ticket/513
+
+
+--- a/src/catalog.cpp
++++ b/src/catalog.cpp
+@@ -1151,8 +1151,13 @@ inline bool CanEncodeStringToCharset(const wxString& s, wxMBConv& conv)
+ {
+     if (s.empty())
+         return true;
+-    wxCharBuffer converted(s.mb_str(conv));
++    const wxCharBuffer converted(s.mb_str(conv));
++#if wxCHECK_VERSION(2,9,0)
+     if ( converted.length() == 0 )
++#else
++    const char *cs = (const char*)converted;
++    if ( cs == NULL || strlen(cs) == 0 )
++#endif
+         return false;
+     return true;
+ }

app-i18n/poedit/poedit-1.5.5.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.5.5.ebuild,v 1.1 2013/02/07 04:08:54 dirtyepic Exp $
+
+EAPI=5
+WX_GTK_VER=2.8
+
+inherit eutils fdo-mime flag-o-matic wxwidgets
+
+DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
+HOMEPAGE="http://poedit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/poedit/${P}.tar.gz"
+
+LICENSE="MIT CCPL-Attribution-2.5 CCPL-Attribution-ShareAlike-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="spell"
+
+RDEPEND="dev-libs/boost
+	>=sys-libs/db-4.7
+	x11-libs/wxGTK:2.8[X]
+	spell? ( app-text/gtkspell:2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx28.patch
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf $(use_enable spell spellchecking)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}

app-i18n/transifex-client/files/transifex-client-0.8.0-tests.patch

@@ -0,0 +1,26 @@
+From b37da095c8e8b70d8d4300b32e787b6da88e28c0 Mon Sep 17 00:00:00 2001
+From: Apostolos Bessas <mpessas@transifex.com>
+Date: Wed, 11 Jul 2012 11:44:07 +0300
+Subject: [PATCH] Do not install the tests.
+
+Exclude the tests from the installed packages.
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index b3fa910..05bb2b4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -49,7 +49,7 @@
+     ],
+     test_suite="tests",
+     zip_safe=False,
+-    packages=find_packages(),
++    packages=['txclib', ],
+     include_package_data=True,
+     package_data = package_data,
+     keywords = ('translation', 'localization', 'internationalization',),
+-- 
+1.7.10
+

app-i18n/transifex-client/transifex-client-0.8.0-r1.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.8.0-r1.ebuild,v 1.1 2013/02/06 16:46:32 floppym Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="http://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
+SRC_URI="http://github.com/transifex/transifex-client/tarball/0.8 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+# Upstream is using a very weird naming scheme
+GITHUB_HASH="b001295"
+S="${WORKDIR}"/${PN/transifex/transifex-transifex}-${GITHUB_HASH}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-tests.patch"
+	distutils_src_prepare
+}

app-misc/anki/Manifest

@@ -1,3 +1,4 @@
 DIST anki-1.2.11.tgz 1886062 SHA256 ca075fd0c0d6851d22046de8f6fa90d7c442cdd4a6783f7c6ffad7fbc46f5089 SHA512 f04ba85afb146c912c77fa047a74dfae34b2900bc4a0c5ab86d2c0787fa69339bd354d1def7083e74ac16da3e8e03efcf49808d817bc502ebb69944cd2ad4d9c WHIRLPOOL dbd445cc4439b6b582a11ae62b813f1773c15b90412d12aa3f06db07a778137d9c0aa06710354a2ab88055887f6d2e44db0f260ebaa4e6042012012a7ee3ee55
 DIST anki-2.0.5.tgz 2901830 SHA256 afc03aeac239d4b01cf34601d975924e828d4c29f5c2150ed286c09633df6cd5 SHA512 b9287996555985c25f465b5d582e2579400f592c8d985c8ca073afe80762bd9977144196b92dbb89d81df19d474062696e6aa7ad9dc4e566b82adbea5f2d4839 WHIRLPOOL 9abb55a93d9f415b209cf98bd637abeeb725689cc0953b042a31075f16ba85d9b8aa945f9ce8cee6f80b1e74d7679d6350cd22d16f9a4c00596732cde404da28
 DIST anki-2.0.6.tgz 2913286 SHA256 53af617fa3ba5429c5a798fae9a29d48b9115e41993cded3f6e7a3c0fc2af904 SHA512 705558b6967d2f0f6b19369979e2f77669587457f9613e060b2373dd010ab30f636c15411d2f40db62e25203d77870ed4bb43d484043822f8b046add61b65d4c WHIRLPOOL 0a36ab017380ab272f2d2aa0c8868ec3bd5ea5d36760d878e2fbfdf1e8a12a8b1653999149a5f9dc66a5819c62aeae2b554bf2f335ab53cb4bf77395528d68d6
+DIST anki-2.0.7.tgz 2918816 SHA256 64af49fd0be82d2664bca6879f74b54b186270379c4012344141903b7be0fe28 SHA512 3ee9f6b3eb88acde2049b28cc1209dfcd600af91b569b53ff463c55a91819133fe92d4a023efb7b000ccb120d18a37a69d394a2ddabec5e6ba0bac6746d09774 WHIRLPOOL 9beefd13923d33e3bdf85f19cfb1fda2303be69f84e3056da0fd8d7ba3b3a09f39448f27d87a4630540d3f5d0bf9318148b514a1091fe6330227642312adb901

app-misc/anki/anki-2.0.7.ebuild

@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.7.ebuild,v 1.1 2013/02/06 08:52:06 patrick Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="http://ichi2.net/anki/"
+SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound"
+
+RDEPEND="dev-python/PyQt4[X,svg,webkit]
+	 >=dev-python/httplib2-0.7.4
+	 dev-python/beautifulsoup:python-2
+	 recording? ( media-sound/lame
+				  >=dev-python/pyaudio-0.2.4 )
+	 sound? ( media-video/mplayer )
+	 latex? ( app-text/texlive
+			  app-text/dvipng )"
+DEPEND=""
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	rm -r thirdparty || die
+	python_convert_shebangs -r 2 .
+}
+
+# Nothing to configure or compile
+src_configure() {
+	true;
+}
+
+src_compile() {
+	true;
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe anki/anki
+
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README README.development
+	insinto "$(python_get_sitedir)"
+	doins -r aqt anki
+}
+
+pkg_preinst() {
+	if has_version "<app-misc/anki-2" ; then
+		elog "Anki 2 is a rewrite of Anki with many new features and"
+		elog "a new database format.  On the first run your decks are"
+		elog "converted to the new format and a backup of your Anki-1"
+		elog "decks is created.  Please read the following:"
+		elog "http://ankisrs.net/anki2.html"
+		elog "The mobile clients for Anki 2 are still under development."
+	fi
+}

app-misc/byobu/metadata.xml

@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
 Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
 It was originally designed to provide elegant enhancements to the otherwise

app-misc/vifm/Manifest

@@ -3,3 +3,4 @@ DIST vifm-0.4.tar.bz2 353731 SHA256 354b47f8a53a3a1cd3b7f9d5f4aa823ee6adbcdf5c28
 DIST vifm-0.5.tar.bz2 272835 SHA256 11bc1138050d6b2887d7f099e12bc57d27cc60a6f14252744654c35d22d38164 SHA512 d20183abf9431275d2c0ef284c2daea7d06eb49d397c6c8592e785cc84374c914d1b21ba967e365d3e82997958624cd5c5763ea05d117f7c7b8a1e6c489c3721 WHIRLPOOL cb95032a532be87d0d31a985754d4479b436317d6149d754cc291b7dbe0c42070d18f98237a585c81073eeab04d6dc056efedb13f334b3ec762c4ed46882e7fd
 DIST vifm-0.7.1.tar.bz2 468781 SHA256 7c0f2e8949851394a0fa91a9e8509a58306ce3aebd27fed163fbec10c2258583 SHA512 09edc76f98bcc6d5d8a3cc436a26d21f460dbab29dd723c49b036b207b5bcd06743fa18970eb9de7325b59ae8c565b407a8db94a063a7abb4107c6c43bf260e1 WHIRLPOOL f52cf9a507172a2b0af90d281a7feed815b371306fbd5cc03ad171bbdfc360904c60cc3e5a8e5ae1cb9ed127d187ecbd8b664267bc36cf9bd79ea437e7af15cb
 DIST vifm-0.7.2.tar.bz2 468086 SHA256 f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9 WHIRLPOOL 9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc
+DIST vifm-0.7.4b.tar.bz2 562778 SHA256 90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57 SHA512 73831065a428f27b440ac901b7e1417ff93319d86ab9d35678d7edddeef96ad53e40a0a90298f93a5f12f7c12d176131ae18e9a89196752fe2a5a3f477e3a17a WHIRLPOOL ec26283648424567cf0871931ff37240a8097ce7efd0b4337a02ac1a4ca3541cab5ae74dfac9dabdb2a0b144b633b2a0f4aeca7c3206ca064e7308ee555568d1

app-misc/vifm/metadata.xml

@@ -8,7 +8,9 @@
 	<use>
 		<flag name="compatibility">Compatibility with previous versions of vifm</flag>
 		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
+		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
+		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
 		<flag name="vim-plugin">Install the vifm vim plugin</flag>
 	</use>
 	<longdescription>

app-misc/vifm/vifm-0.7.4b-r1.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.4b-r1.ebuild,v 1.1 2013/02/06 12:17:52 wired Exp $
+
+EAPI=5
+inherit base vim-doc
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE="X +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.7-r7
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS=( AUTHORS TODO README )
+
+src_configure() {
+	econf \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	base_src_install
+
+	if use vim; then
+		local t
+		for t in doc plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	use vim && update_vim_helptags
+}

app-office/akonadi-server/Manifest

@@ -1,2 +1,3 @@
 DIST akonadi-1.8.0.tar.bz2 213413 SHA256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d SHA512 9f995d90d84c8fa7bf51691b4bdabda69e64578dc7a2f0ee0b20979ef3da9e2128625c34b4ce84e5feb79c61615df7299905b2eeded9abcbe8deb22817e1821e WHIRLPOOL 492d184fa20a09e1f68438da8519e176731b1c2d66e01b8a2dfc940da24f167ae33bd00a51900444a18a6203a2165e4e70ef4a1c2db34ac4cc0660744f7a9230
 DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b0c58e28f215ffdc941b48c347 SHA512 8b33d9b2ee845e6ab8e01879f36b5a33c3ef1901490718859646f5b8a7ceffd6def1e788a218741023408991fef4c6cbb4769f125927801951515171ddbc6a7c WHIRLPOOL f20493ff6f1e3ae024dc47dfe7cb8f386fb4ce812cd30bd8132e09b75dc09fc884f41b9545ec46f6828b4582b7ee84f64c9586763eb5f221d3eb02da9e5e86f4
+DIST akonadi-1.9.0.tar.bz2 220255 SHA256 6ff5c23e426efc02784d4ab1a6e6dff24c8efe81fd34ec78bb52bb4d7733e013 SHA512 e982f98263ae7cce3af90a7282ead72802ab3c611c3d664ed995e630b036548cbcbacf290fd591e00cbc3584e989bbb9e563ff7736c785609ebd84d011750779 WHIRLPOOL 8df1b77e3725c68e8ecd6f1c937da4124127132980cb58deec937a4dd11032f02f2cf8d5bc775f40e402d2925ae2f0c1d2135330182140838c825bb4451594bc

app-office/akonadi-server/akonadi-server-1.8.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.8.1.ebuild,v 1.4 2012/11/30 15:11:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.8.1.ebuild,v 1.5 2013/02/07 01:03:41 naota Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://pim.kde.org/akonadi"
 SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="mysql postgres +sqlite test"
 

app-office/akonadi-server/akonadi-server-1.9.0.ebuild

@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.0.ebuild,v 1.4 2013/02/07 04:13:39 alexxy Exp $
+
+EAPI=4
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
+		ewarn
+		ewarn "The default storage drive has changed from SQLite to MySQL."
+		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DWITH_QT5=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}

app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch

@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0efd25..efcdbe0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
+ option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
+ option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
+ option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
++OPTION(WITH_QT5 "Build against Qt5." TRUE)
+ 
+ if(NOT DEFINED DATABASE_BACKEND)
+   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
+@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
+ set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
+ set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
+ 
+-find_package(Qt5Core QUIET)
++if (WITH_QT5)
++  find_package(Qt5Core QUIET)
++endif()
++
+ if (Qt5Core_FOUND)
+   find_package(Qt5Gui REQUIRED)
+   find_package(Qt5Widgets REQUIRED)

app-text/calibre/Manifest

@@ -1,3 +1,2 @@
 DIST calibre-0.9.14.tar.xz 27947396 SHA256 e9df7052902a2c5447abe4305d7cee0c8b675b52f299d6a879d232d3901059a1 SHA512 bdb25750386d692ee909c5affe1845f4098444d340f80333a6002f6a1964477ebad0fc5f80bf1c499238986cab95733a75a8051dde937babf9065ca06fdb60b4 WHIRLPOOL bce5a0486eb9bd45aed16b14df78b8472cee0da2392958889e340f2b6f9eea8e965b4a7e8e5f1fee842d76e17b25d46feb68b9d8f415a55b1bd0862b71c5b223
-DIST calibre-0.9.16.tar.xz 28002468 SHA256 053c1b332ce7dae8c7cc96018637e5abeecd791028ab86726f13c782cc6b82e0 SHA512 5b0d980bc88a077e6f4ac39dffad14d5a40316516eb947fd4a51390d85634e8d0a4fa1e51478a2805d65a4946801003d1946533be7808efbb4535465176fd2c8 WHIRLPOOL e4129756f1bde575309a2a39f727df618abdb78902b3d157a67963574ddb1ecd82f71dbc34c598bb0a6dc27e32776b86428a49bda87919ad46c611788642f60e
 DIST calibre-0.9.17.tar.xz 28020076 SHA256 520dc6f46fc6984ce7882f3eb720313df38a3041dfd8275daa55c3a0a22e0ad9 SHA512 0c6d8331c8bbcea23987d8ab33b75247614a86ac048f4ad47a569d67f8ab8fda7b929cf477d2fcd2b20f9c67cec981518d4aeb2618fe3f45ee5f3129b1084031 WHIRLPOOL e948fc3b62ff7cc66a541d4f1df6d4bd5c5b430d3996b8962eb3d118999d2ad33c8ef41e88ed445e0bb887173187b38c7b0ba643c2942707308308c2bf0cf045

app-text/calibre/calibre-0.9.14.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.14.ebuild,v 1.2 2013/01/12 15:35:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.14.ebuild,v 1.4 2013/02/07 03:29:05 zmedico Exp $
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND=2:2.7
 PYTHON_USE_WITH="ssl sqlite"
 
@@ -21,10 +21,10 @@ SLOT="0"
 IUSE="+udisks"
 
 COMMON_DEPEND="
-	>=app-text/podofo-0.8.2
+	>=app-text/podofo-0.8.2:=
 	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40
-	>=dev-libs/icu-4.4
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
 	>=dev-python/beautifulsoup-3.0.5:python-2
 	dev-python/netifaces
 	dev-python/python-dateutil
@@ -38,13 +38,13 @@ COMMON_DEPEND="
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
 	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2
+	>=media-gfx/imagemagick-6.5.9:=[jpeg,png]
+	>=media-libs/freetype-2:=
 	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.4
-	virtual/libusb:1
-	x11-libs/qt-dbus:4
-	x11-libs/qt-svg:4
+	>=media-libs/libmtp-1.1.4:=
+	virtual/libusb:1=
+	x11-libs/qt-dbus:4=
+	x11-libs/qt-svg:4=
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}

app-text/calibre/calibre-0.9.16.ebuild

@@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.16.ebuild,v 1.1 2013/01/25 17:35:05 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40
-	>=dev-libs/icu-4.4
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2
-	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.4
-	virtual/libusb:1
-	x11-libs/qt-dbus:4
-	x11-libs/qt-svg:4
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|xdg-mime install|\\0 --mode user|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-}
-
-src_install() {
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
-	# due to bug #389515 (instead, calibre now calls udisks via dbus).
-	rm "${ED}usr/bin/calibre-mount-helper" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}

app-text/calibre/calibre-0.9.17.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.17.ebuild,v 1.1 2013/02/01 15:34:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.17.ebuild,v 1.3 2013/02/07 03:29:05 zmedico Exp $
 
-EAPI=4
+EAPI=5
 PYTHON_DEPEND=2:2.7
 PYTHON_USE_WITH="ssl sqlite"
 
@@ -21,10 +21,10 @@ SLOT="0"
 IUSE="+udisks"
 
 COMMON_DEPEND="
-	>=app-text/podofo-0.8.2
+	>=app-text/podofo-0.8.2:=
 	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40
-	>=dev-libs/icu-4.4
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
 	>=dev-python/beautifulsoup-3.0.5:python-2
 	dev-python/netifaces
 	dev-python/python-dateutil
@@ -38,13 +38,13 @@ COMMON_DEPEND="
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
 	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/freetype-2
+	>=media-gfx/imagemagick-6.5.9:=[jpeg,png]
+	>=media-libs/freetype-2:=
 	>=media-libs/libwmf-0.2.8
-	>=media-libs/libmtp-1.1.4
-	virtual/libusb:1
-	x11-libs/qt-dbus:4
-	x11-libs/qt-svg:4
+	>=media-libs/libmtp-1.1.4:=
+	virtual/libusb:1=
+	x11-libs/qt-dbus:4=
+	x11-libs/qt-svg:4=
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}

app-text/po4a/po4a-0.42.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.42.ebuild,v 1.9 2013/02/05 13:23:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.42.ebuild,v 1.10 2013/02/06 19:38:12 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/SGMLSpm

app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch

@@ -1,62 +0,0 @@
-From 5321959587ee0597703328213eb46716a3c0bb09 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 5 Feb 2013 22:18:01 -0500
-Subject: [PATCH] Use gawk, not awk
-
-Some other awk implementations (e.g. nawk) fail with a syntax error:
-
-awk: syntax error at source line 2
- context is
-     >>> BEGIN <<<  {
----
- tools/yelp-build.in | 4 ++--
- tools/yelp-check.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/yelp-build.in b/tools/yelp-build.in
-index 1d70145..5058d6e 100755
---- a/tools/yelp-build.in
-+++ b/tools/yelp-build.in
-@@ -35,7 +35,7 @@ mkdir_p () {
- }
- 
- urlencode () {
--    LANG=C awk '
-+    LANG=C gawk '
- BEGIN {
-   for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
- }
-@@ -53,7 +53,7 @@ BEGIN {
- }
- 
- urldecode () {
--    LANG=C awk '
-+    LANG=C gawk '
- BEGIN {
-   for(i = 0; i < 10; i++) hex[i] = i;
-   hex["A"] = hex["a"] = 10;
-diff --git a/tools/yelp-check.in b/tools/yelp-check.in
-index a258290..4961d67 100755
---- a/tools/yelp-check.in
-+++ b/tools/yelp-check.in
-@@ -30,7 +30,7 @@ urlencode () {
-     else
-         urlencode_slash='\/'
-     fi
--    echo "$1" | LANG=C awk '
-+    echo "$1" | LANG=C gawk '
- BEGIN {
-   for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
- }
-@@ -48,7 +48,7 @@ BEGIN {
- }
- 
- urldecode () {
--    echo "$1" | LANG=C awk '
-+    echo "$1" | LANG=C gawk '
- BEGIN {
-   for(i = 0; i < 10; i++) hex[i] = i;
-   hex["A"] = hex["a"] = 10;
--- 
-1.8.1.2
-

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

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.8 2013/02/06 03:29:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.10 2013/02/06 05:54:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,12 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
-# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8
 	dev-util/itstool
 	gnome-extra/yelp-xsl
-	sys-apps/gawk"
+	virtual/awk"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 

app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild

@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild,v 1.1 2013/02/06 03:29:14 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
-RDEPEND=">=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	gnome-extra/yelp-xsl
-	sys-apps/gawk"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
-	default
-}

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

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.10 2013/02/06 03:29:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.12 2013/02/06 05:54:04 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
-# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8
 	dev-util/itstool
 	gnome-extra/yelp-xsl
-	sys-apps/gawk"
+	virtual/awk"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

dev-cpp/gtest/metadata.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>tomka@gentoo.org</email>
+	<name>Thomas Kahle</name>
 	</maintainer>
 	<upstream>
 		<doc lang="en">http://code.google.com/p/googletest/w/list</doc>

dev-cpp/tbb/tbb-4.1.20121003.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.2 2012/12/22 14:06:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.4 2013/02/06 04:26:24 ago Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
 LICENSE="GPL-2-with-exceptions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND=""

dev-db/barman/Manifest

@@ -2,3 +2,4 @@ DIST barman-1.0.0.tar.gz 53138 SHA256 dc157220cf0eab6698ebb5fc714deea429223a26ae
 DIST barman-1.1.0.tar.gz 56549 SHA256 ab176c1aea199c2a8314c781dcd5f733f513f0334e2f90f6dfbc3caf294c641e SHA512 eb2ce6979ab7729c31cddbd2bc93f74e2b9d1c5a9de4991902d44b395b8e62e742865bd8ae6c4ea05c87498eda5c167c1895314c945ef31932b658fbe8006625 WHIRLPOOL 293a28e32515f4c4956700f67c517789c18bde5ee15b1237b26d26135675bdb0561a5c6c611b45a1104bc0edeb5c2a5688bfbda3890a31995b034e9282b078ad
 DIST barman-1.1.1.tar.gz 56723 SHA256 1298beab5813ecbbaf054c3b781c0521bc8662876aa188893409e8c80819ec2a SHA512 58c22b0b68d6d198bc40815b38d4e05212768c9ba4fb196a05780c8c0bfd1e52e6bf8efc5b5e206dd889a80d0d02a2480b65d62a49f5f6374f208f00394df658 WHIRLPOOL 9877692eba4b6a707a80027235244df08d42836b70ce4d287efcedff725f851d2790255585626db309aeb14b0f5b0aba8a7179e694b8db3ffac706e1429b142d
 DIST barman-1.1.2.tar.gz 58910 SHA256 474d245cd08cec1ba3fc1f93e478ff115f5d00503c29aa9612018068b7752d3b SHA512 5da1807d5304847ebaf440604236d4956baeaa0f31ba9059316212df9b16f2721108ce7684ffa9f26787ea8b9a1a123ba7d54e270cb1d0bb237da6069bd73cca WHIRLPOOL ded87e02a6fe690d9b468129336d77d246e0d6b1fe9fe882756989e6ccb100e992e607d8e8de442217b0f4417b17af1a0bc0e764f8704f469448d867ce007e89
+DIST barman-1.2.0.tar.gz 67690 SHA256 4cca3106d855086f7f77735290afb09872b4f4b6065d831576333b52f5c078db SHA512 08403c528eeb0ee2a398af9058be4e1b0a3a2703d9109a09a66e9067898f17bf49a47f41809a5f5dba027a7c00025979aad4b0b948d3d9acf3666f6a862a1cad WHIRLPOOL dad434292a6bd47702f16eaa69968f1deb184dd2824bc012fe231abd02c5508235ebfbb3476003095c3148b4c1ed3f855e8433b26ea54630e07e96e7deae7d7b

dev-db/barman/barman-1.2.0.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/barman/barman-1.2.0.ebuild,v 1.1 2013/02/06 08:43:32 patrick Exp $
+EAPI=4
+
+inherit distutils
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh
+	>=dev-python/psycopg-2
+	dev-python/python-dateutil
+	net-misc/rsync
+	dev-db/postgresql-server"
+DEPEND=""

dev-db/m17n-db/m17n-db-1.6.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.4.ebuild,v 1.1 2012/12/03 09:01:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.4.ebuild,v 1.2 2013/02/06 19:47:07 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"

dev-db/tora/Manifest

@@ -1,2 +1,2 @@
-DIST tora-2.1.1.tar.gz 5356473 SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663
-DIST tora-2.1.3.tar.gz 12284451 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b
+DIST tora-2.1.1.tar.gz 5356473 SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663 SHA512 57c431e802a3e6abd29dc8db0fd7eeeb7a98fe4c923ebb72469e5e1887f05dd8ffab069a9d8df57455b6be7abba7806cdc447b0333a42b898d7072038eb7865b WHIRLPOOL 4cd86a1499057ab919cd87dd8a80d5969cd9eb70832938d28a35419ecca0061e7b61ef3bda32ac88b04738a8c3ad28de083d9ecf85017afd5a97e9a0da480a11
+DIST tora-2.1.3.tar.gz 12284451 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b SHA512 817de0eed05dcc89baf5dbf51d88577cf21b809435d76eef76bfc5ad9e5b5c8228c5cf0ac41d126144e3b41feb73fba04e62af7564fde2a11e9c81c62be59329 WHIRLPOOL aa81539e5218acd284c0bd44787220f3926734bd8c91fa7b3ddb86de6a6a50c7a8036f4bf6b5a89f246c52ff9d45533da108db9a7b1a5f5a162f20c87d5953d4

dev-db/tora/files/tora-9999-ext-loki.patch

@@ -0,0 +1,86 @@
+diff -Naur tora-2.1.4~/CMakeLists.txt tora-2.1.4/CMakeLists.txt
+--- tora-2.1.4~/CMakeLists.txt	2013-02-04 16:36:35.000000000 +0100
++++ tora-2.1.4/CMakeLists.txt	2013-02-04 17:07:00.084287072 +0100
+@@ -4,6 +4,7 @@
+ # options available for user's input
+ OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
+ OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
++OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF)
+ OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
+ OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
+ OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
+@@ -54,6 +55,7 @@
+ INCLUDE(CheckTypeSize)
+ INCLUDE(TestBigEndian)
+ INCLUDE(FindSubversion)
++INCLUDE(FindPkgConfig)
+ 
+ 
+ #Set the custom CMake module directory where our include/lib finders are
+@@ -222,6 +224,10 @@
+     MESSAGE(FATAL_ERROR "No Qt4 found")
+ ENDIF(QT_FOUND)
+ 
++IF (WANT_INTERNAL_LOKI)
++ELSE (WANT_INTERNAL_LOKI)
++  pkg_check_modules(LOKI REQUIRED  ferrisloki)
++ENDIF (WANT_INTERNAL_LOKI)
+ 
+ IF (WANT_INTERNAL_QSCINTILLA)
+     MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")
+diff -Naur tora-2.1.4~/src/CMakeLists.txt tora-2.1.4/src/CMakeLists.txt
+--- tora-2.1.4~/src/CMakeLists.txt	2013-02-04 16:36:21.000000000 +0100
++++ tora-2.1.4/src/CMakeLists.txt	2013-02-04 17:06:50.373408475 +0100
+@@ -3,7 +3,10 @@
+ 
+ #Subdirectories
+ # ADD_SUBDIRECTORY(i18n)
+-ADD_SUBDIRECTORY(loki)
++# Default: loki as 3rd party lib!
++IF (WANT_INTERNAL_LOKI)
++  ADD_SUBDIRECTORY(loki)
++ENDIF(WANT_INTERNAL_LOKI)
+ IF (WIN32)
+     ADD_SUBDIRECTORY(windows)
+ ENDIF (WIN32)
+@@ -497,7 +500,9 @@
+ QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
+ 
+ 
+-LINK_DIRECTORIES(./loki)
++IF (WANT_INTERNAL_LOKI)
++  LINK_DIRECTORIES(./loki)
++ENDIF(WANT_INTERNAL_LOKI)
+ IF (WIN32)
+     LINK_DIRECTORIES(./windows)
+ ENDIF (WIN32)
+@@ -506,7 +511,10 @@
+ ENDIF (WANT_INTERNAL_QSCINTILLA)
+ 
+ 
+-SET(TORA_LOKI_LIB "tora_loki_lib")
++IF (WANT_INTERNAL_LOKI)
++  SET(LOKI_LIBRARIES "tora_loki_lib")
++  SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include)
++ENDIF(WANT_INTERNAL_LOKI)
+ IF (WANT_INTERNAL_QSCINTILLA)
+     SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib)
+ ENDIF (WANT_INTERNAL_QSCINTILLA)
+@@ -522,7 +530,7 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_BINARY_DIR}
+   ${QT_INCLUDES}
+-  ${CMAKE_CURRENT_SOURCE_DIR}/loki/include
++  ${LOKI_INCLUDE_DIRS}
+   ${CMAKE_CURRENT_SOURCE_DIR}/otl
+ )
+ 
+@@ -648,7 +656,7 @@
+ ENDIF(USE_EXPERIMENTAL)  
+ 
+ # static
+-TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB})
++TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES})
+ IF (WANT_INTERNAL_QSCINTILLA)
+     TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES})
+ ENDIF (WANT_INTERNAL_QSCINTILLA)

dev-db/tora/tora-9999.ebuild

@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.1 2013/02/06 21:15:21 haubi Exp $
+
+EAPI=2
+
+inherit cmake-utils eutils
+
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora"
+	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="TOra - Toolkit For Oracle"
+HOMEPAGE="http://tora.sourceforge.net"
+IUSE="debug mysql oracle oci8-instant-client postgres"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+
+DEPEND="
+	dev-libs/ferrisloki
+	x11-libs/qscintilla
+	x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[mysql?,postgres?]
+	x11-libs/qt-xmlpatterns:4
+	oci8-instant-client? (
+		dev-db/oracle-instantclient-basic
+		dev-db/oracle-instantclient-sqlplus
+	)
+	postgres? ( dev-db/postgresql-server )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then
+		eerror "ORACLE_HOME variable is not set."
+		eerror
+		eerror "You must install Oracle >= 8i client for Linux in"
+		eerror "order to compile TOra with Oracle support."
+		eerror
+		eerror "Otherwise specify -oracle in your USE variable."
+		eerror
+		eerror "You can download the Oracle software from"
+		eerror "http://www.oracle.com/technetwork/indexes/downloads/"
+		die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ext-loki.patch #383109
+	sed -i \
+		-e "/COPYING/ d" \
+		CMakeLists.txt || die "Removal of COPYING file failed"
+	# 'svn info' needs .svn subdirectory
+	[[ ${PV} != 9999 ]] || ln -s "${ESVN_WC_PATH}"/.svn .svn || die
+}
+
+src_configure() {
+	local mycmakeargs=()
+	if use oracle || use oci8-instant-client ; then
+		mycmakeargs=(-DENABLE_ORACLE=ON)
+	else
+		mycmakeargs=(-DENABLE_ORACLE=OFF)
+	fi
+	mycmakeargs+=(
+		-DWANT_RPM=OFF
+		-DWANT_BUNDLE=OFF
+		-DWANT_BUNDLE_STANDALONE=OFF
+		-DWANT_INTERNAL_QSCINTILLA=OFF
+		-DWANT_INTERNAL_LOKI=OFF
+		$(cmake-utils_use_enable postgres PGSQL)
+		$(cmake-utils_use_want debug)
+		# path variables
+		-DTORA_DOC_DIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon src/icons/${PN}.xpm || die
+	domenu debian/${PN}.desktop || die
+}

dev-games/aseprite/Manifest

@@ -0,0 +1 @@
+DIST aseprite-0.9.5.tar.xz 507744 SHA256 81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00 WHIRLPOOL 060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef

dev-games/aseprite/aseprite-0.9.5.ebuild

@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-0.9.5.ebuild,v 1.1 2013/02/07 00:45:59 tomwij Exp $
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+SRC_URI="http://aseprite.googlecode.com/files/aseprite-${PV}.tar.xz"
+
+LICENSE="GPL-2 FTL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug memleak static test"
+
+RDEPEND="dev-libs/tinyxml
+	media-libs/allegro:0[X,png]
+	media-libs/giflib
+	media-libs/libpng:0
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}"/aseprite-0.9.5-as-needed.patch )
+
+DOCS=( docs/quickref.odt
+	docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt )
+
+src_prepare() {
+	base_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+
+	# Only do a static link with Allegro if the user explicitly wants it.
+	if ! use static ; then
+		sed -i '/-DALLEGRO_STATICLINK/d' CMakeLists.txt || die
+	fi
+
+	# Remove long compiling tests for users with FEATURES="-test",
+	# also removes the gtest dependency from the build.
+	if ! use test ; then
+		sed -i '/^find_unittests/d' src/CMakeLists.txt || die
+		sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt || die
+		sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DUSE_SHARED_ALLEGRO4=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DFULLSCREEN_PLATFORM=ON
+		$(cmake-utils_use_enable memleak)
+		$(cmake-utils_use_use static STATIC_LIBC)
+	)
+
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_SHARED_GTEST=ON
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Warning: aseprite might not choose the resolution correctly; so, you might need"
+	elog "         to change the resolution once using the -resolution WxH[xBPP] argument."
+	elog ""
+	elog "         On subsequent runs, aseprite will remember the resolution you have set."
+	elog ""
+	elog "         For example: \`aseprite -resolution 1440x900\`"
+}

dev-games/aseprite/aseprite-9999.ebuild

@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/aseprite/aseprite-9999.ebuild,v 1.1 2013/02/07 00:45:59 tomwij Exp $
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic git-2
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+EGIT_REPO_URI="git://github.com/dacap/${PN}.git"
+
+LICENSE="GPL-2 FTL"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="debug memleak static test"
+
+RDEPEND="dev-libs/tinyxml
+	media-libs/allegro:0[X,png]
+	media-libs/giflib
+	media-libs/libpng:0
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+DOCS=( docs/quickref.odt
+	docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt )
+
+src_prepare() {
+	base_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+
+	# Only do a static link with Allegro if the user explicitly wants it.
+	if ! use static ; then
+		sed -i '/-DALLEGRO_STATICLINK/d' CMakeLists.txt || die
+	fi
+
+	# Remove long compiling tests for users with FEATURES="-test",
+	# also removes the gtest dependency from the build.
+	if ! use test ; then
+		sed -i '/^find_unittests/d' src/CMakeLists.txt || die
+		sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt || die
+		sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DUSE_SHARED_ALLEGRO4=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DFULLSCREEN_PLATFORM=ON
+		$(cmake-utils_use_enable memleak)
+		$(cmake-utils_use_use static STATIC_LIBC)
+	)
+
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_SHARED_GTEST=ON
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Warning: aseprite might not choose the resolution correctly; so, you might need"
+	elog "         to change the resolution once using the -resolution WxH[xBPP] argument."
+	elog ""
+	elog "         On subsequent runs, aseprite will remember the resolution you have set."
+	elog ""
+	elog "         For example: \`aseprite -resolution 1440x900\`"
+}

dev-games/aseprite/files/aseprite-0.9.5-as-needed.patch

@@ -0,0 +1,38 @@
+Description: fix FTBFS with --as-needed linker option
+ Libraries must be placed after object files in command line.
+Author: Ilya Barygin <randomaction@ubuntu.com>
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -135,6 +135,10 @@
+ # All libraries for .exe files
+ set(all_libs ${aseprite_libraries} ${libs3rdparty} ${sys_libs})
+ 
++if(LIBALLEGRO4_LINK_FLAGS)
++  set(all_libs ${all_libs} ${LIBALLEGRO4_LINK_FLAGS})
++endif()
++
+ ######################################################################
+ # ASEPRITE libraries
+ 
+@@ -405,10 +409,6 @@
+ 
+ add_executable(aseprite WIN32 main.cpp ${win32_resources} ${x11_resources})
+ target_link_libraries(aseprite ${all_libs})
+-if(LIBALLEGRO4_LINK_FLAGS)
+-  set_target_properties(aseprite
+-    PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
+-endif()
+ 
+ install(TARGETS aseprite
+   RUNTIME DESTINATION bin)
+@@ -450,8 +450,7 @@
+     endif()
+ 
+     if(LIBALLEGRO4_LINK_FLAGS)
+-      set_target_properties(${testname}
+-	PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
++      target_link_libraries(${testname} ${LIBALLEGRO4_LINK_FLAGS})
+     endif()
+ 
+     if(extra_definitions)

dev-games/aseprite/metadata.xml

@@ -0,0 +1,15 @@
+<?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>
+  <longdescription>
+    Animated sprite editor and pixel art tool
+  </longdescription>
+  <use>
+    <flag name="memleak">Enable memory-leaks detector (only for developers)</flag>
+    <flag name="static">Link against static version of C and C++ runtimes</flag>
+  </use>
+</pkgmetadata>

dev-libs/boehm-gc/metadata.xml

@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>sera@gentoo.org</email>
+	<name>Ralph Sennhauser</name>
+	</maintainer>
+	<maintainer>
+	<email>patrick@gentoo.org</email>
+	<name>Patrick Lauer</name>
 	</maintainer>
 </pkgmetadata>

dev-libs/geoip/geoip-1.4.8-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r2.ebuild,v 1.10 2013/02/04 10:11:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r2.ebuild,v 1.11 2013/02/06 19:41:34 ago Exp $
 
 EAPI=4
 inherit autotools
@@ -19,7 +19,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 perl-geoipupdate static-libs"
 
 DEPEND="sys-libs/zlib"

dev-libs/icu/Manifest

@@ -2,3 +2,4 @@ DIST icu4c-49_1_2-docs.zip 4245617 SHA256 50fcc81a797b20ebaf12167479f24eac323bad
 DIST icu4c-49_1_2-src.tgz 19010646 SHA256 cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 SHA512 83997878222ada25be281c35b766906a9997da350068d4f7400874ea37133baeef0e8277dc117219c37ab486b643125b4b73ace956507d2237c1c9002173a140 WHIRLPOOL 68ff12ab0b3b5e471ced5d07c7170494e24526591587669b86a2a732ce3d0dda4abd74e2dcfdc3dd2e66a30b28d897836a6b0c1f1148101e1b51ffc87a87f080
 DIST icu4c-50_1-src.tgz 21181132 SHA256 68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350 SHA512 01a3e42b6180641ae7569bba70c31509d2c65bc7cdd8e84a74444d5da1964486af001d0436c0e6b85ce8867d75bbdcf0b2ad2d18ed24196104db73fc469a301d WHIRLPOOL c7f958be4734d05cc0fcf1a541cc77618fbaabdeeda986b96de14e2a76ccf3eb2ed4b57548d9fb931f510f46207441e99f6f96217aa481bea3bb540b20b6d687
 DIST icu4c-50_1_1-src.tgz 21189084 SHA256 a6f426e3c04749c74bcb9d2ce229f905de88deda2353db2249f2e96fe604df8f SHA512 0af83f880eeacbd9e095c21a63312b94885f11f5c57826b2bbacbae49e589ccacfccccc0c95f37a186a55b5aed7cdb125dd98a0f8b39963b716687506dca3615 WHIRLPOOL b434902fc96e4f6f637813a766ac6989add7470800a6ae5927787e3cc1b5bd5a53556d48c880270c4aa50aae388b7aa65c6f186014e04eca86f4ca4c6d45be16
+DIST icu4c-50_1_2-src.tgz 21189361 SHA256 cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 SHA512 473824582f1240bbe985ce449438e5130955b98d13af1cbc9df5fae26a2080a459501298a6a779c793e39578b771d55c0c67ab7e29c668320809506a41e87d2b WHIRLPOOL 51c2c2e297f01e894927d0485774f70f0da66221fc73ca49322c4ecfc806eefb628a46af0b7e4aa75771bb57109660f9f7fdc05d92cd58d8e738558d313eb4a7

dev-libs/icu/files/icu-50.1-no-c++11.patch

@@ -1,46 +0,0 @@
-diff -Naur icu.orig/source/configure.in icu/source/configure.in
---- icu.orig/source/configure.in	2012-11-03 09:16:37.937159045 +0100
-+++ icu/source/configure.in	2012-11-03 09:20:30.019550761 +0100
-@@ -955,42 +955,6 @@
-     ;;
- esac
- 
--# GCC >= 4.4 supports UTF16 string literals. The CFLAGS and CXXFLAGS may change in the future.
--if test "$CHECK_UTF16_STRING_RESULT" = "unknown"; then
--    if test "$GCC" = yes; then
--        OLD_CFLAGS="${CFLAGS}"
--        CFLAGS="${CFLAGS} -std=gnu99"
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
--static const char16_t test[] = u"This is a UTF16 literal string.";
--        ]], [[]])],[CC_UTF16_STRING=1],[CC_UTF16_STRING=0])
--        if test "$CC_UTF16_STRING" = 1; then
--            CHECK_UTF16_STRING_RESULT="C only";
--        else
--            CFLAGS="${OLD_CFLAGS}"
--        fi
--    fi
--    if test "$GXX" = yes; then
--        OLD_CXXFLAGS="${CXXFLAGS}"
--        # -Wno-return-type-c-linkage is desired so that stable ICU API is not warned about.
--        CXXFLAGS="${CXXFLAGS} -std=c++11"
--        AC_LANG_PUSH([C++])
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
--static const char16_t test[] = u"This is a UTF16 literal string.";
--        ]], [[]])],[CXX_UTF16_STRING=1],[CXX_UTF16_STRING=0])
--        AC_LANG_POP([C++])
--        if test "$CXX_UTF16_STRING" = 1; then
--            if test "$CC_UTF16_STRING" = 1; then
--                CHECK_UTF16_STRING_RESULT="available";
--            else
--                CHECK_UTF16_STRING_RESULT="C++ only";
--            fi
--        else
--            CXXFLAGS="${OLD_CXXFLAGS}"
--        fi
--    fi
--fi
--AC_MSG_RESULT($CHECK_UTF16_STRING_RESULT)
--
- # Enable/disable extras
- AC_ARG_ENABLE(extras,
- 	[  --enable-extras         build ICU extras [default=yes]],

dev-libs/icu/files/icu-50.1.2-bsd.patch

@@ -0,0 +1,10 @@
+--- tools/genrb/derb.c.orig	2012-11-05 18:14:54.000000000 +0100
++++ tools/genrb/derb.c	2012-12-17 04:02:54.787359037 +0100
+@@ -27,6 +27,7 @@
+ #include "ustrfmt.h"
+ 
+ #include <stdlib.h>
++#define _TRUNCATE_DECLARED
+ #include <stdio.h>
+ #include <ctype.h>
+ 

dev-libs/icu/files/icu.7601.Indic-ccmp.patch

@@ -0,0 +1,43 @@
+--- icu/source/layout/IndicReordering.cpp	2009-07-01 20:51:26.000000000 +0200
++++ icu/source/layout/IndicReordering.cpp	2011-01-08 11:12:49.950566538 +0100
+@@ -13,6 +13,7 @@
+ 
+ U_NAMESPACE_BEGIN
+ 
++#define ccmpFeatureTag LE_CCMP_FEATURE_TAG
+ #define loclFeatureTag LE_LOCL_FEATURE_TAG
+ #define initFeatureTag LE_INIT_FEATURE_TAG
+ #define nuktFeatureTag LE_NUKT_FEATURE_TAG
+@@ -35,6 +36,7 @@
+ #define caltFeatureTag LE_CALT_FEATURE_TAG
+ #define kernFeatureTag LE_KERN_FEATURE_TAG
+ 
++#define ccmpFeatureMask 0x00000001UL
+ #define loclFeatureMask 0x80000000UL
+ #define rphfFeatureMask 0x40000000UL
+ #define blwfFeatureMask 0x20000000UL
+@@ -73,7 +75,7 @@
+ 
+ #define repositionedGlyphMask   0x00000002UL
+ 
+-#define basicShapingFormsMask ( loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
++#define basicShapingFormsMask ( ccmpFeatureMask | loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
+ #define positioningFormsMask ( kernFeatureMask | distFeatureMask | abvmFeatureMask | blwmFeatureMask )
+ #define presentationFormsMask ( presFeatureMask | abvsFeatureMask | blwsFeatureMask | pstsFeatureMask | halnFeatureMask | caltFeatureMask )
+ 
+@@ -480,6 +482,7 @@
+ #define tagArray0 (rphfFeatureMask | tagArray1)
+ 
+ static const FeatureMap featureMap[] = {
++    {ccmpFeatureTag, ccmpFeatureMask},
+     {loclFeatureTag, loclFeatureMask},
+     {initFeatureTag, initFeatureMask},
+     {nuktFeatureTag, nuktFeatureMask},
+@@ -502,6 +505,7 @@
+ static const le_int32 featureCount = LE_ARRAY_SIZE(featureMap);
+ 
+ static const FeatureMap v2FeatureMap[] = {
++    {ccmpFeatureTag, ccmpFeatureMask},
+ 	{loclFeatureTag, loclFeatureMask},
+     {nuktFeatureTag, nuktFeatureMask},
+     {akhnFeatureTag, akhnFeatureMask},

dev-libs/icu/files/icu.8198.revert.icu5431.patch

@@ -0,0 +1,129 @@
+Index: icu/trunk/source/layout/IndicReordering.cpp
+===================================================================
+--- icu/trunk/source/layout/IndicReordering.cpp	(revision 25772)
++++ icu/trunk/source/layout/IndicReordering.cpp	(revision 26090)
+@@ -126,4 +126,8 @@
+     FeatureMask fSMFeatures;
+ 
++    LEUnicode   fPreBaseConsonant;
++    LEUnicode   fPreBaseVirama;
++    le_int32    fPBCIndex;
++    FeatureMask fPBCFeatures;
+ 
+     void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
+@@ -172,5 +176,6 @@
+           fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
+           fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+-          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
++          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
++          fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
+     {
+         // nothing else to do...
+@@ -191,4 +196,6 @@
+         fVMabove = fVMpost  = 0;
+         fSMabove = fSMbelow = 0;
++
++        fPreBaseConsonant = fPreBaseVirama = 0;
+     }
+ 
+@@ -386,4 +393,12 @@
+     }
+ 
++    void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
++    {
++        fPBCIndex = index;
++        fPreBaseConsonant = PBConsonant;
++        fPreBaseVirama = PBVirama;
++        fPBCFeatures = features;
++    }
++
+     void noteBaseConsonant()
+     {
+@@ -465,4 +480,20 @@
+     }
+     
++    void writePreBaseConsonant()
++    {
++        // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam.  However,
++        // it seems that almost none of the fonts for Malayalam are set up to handle this.
++        // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
++
++        if (fPreBaseConsonant == 0x0d31) { // RRA
++            fPreBaseConsonant = 0x0d30; // RA
++        }
++        
++        if (fPreBaseConsonant != 0) {
++            writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
++            writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
++        }
++    }
++
+     le_int32 getOutputIndex()
+     {
+@@ -723,4 +754,5 @@
+             }
+ 
++            
+             IndicClassTable::CharClass charClass = CC_RESERVED;
+             IndicClassTable::CharClass nextClass = CC_RESERVED;
+@@ -730,7 +762,9 @@
+             le_bool  seenVattu = FALSE;
+             le_bool  seenBelowBaseForm = FALSE;
++            le_bool  seenPreBaseForm = FALSE;
+             le_bool  hasNukta = FALSE;
+             le_bool  hasBelowBaseForm = FALSE;
+             le_bool  hasPostBaseForm = FALSE;
++            le_bool  hasPreBaseForm = FALSE;
+ 
+             if (postBase < markStart && classTable->isNukta(chars[postBase])) {
+@@ -746,12 +780,20 @@
+                 hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
+                 hasPostBaseForm  = IndicClassTable::hasPostBaseForm(charClass)  && !hasNukta;
++                hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
+ 
+                 if (IndicClassTable::isConsonant(charClass)) {
+                     if (postBaseLimit == 0 || seenVattu ||
+                         (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+-                        !(hasBelowBaseForm || hasPostBaseForm)) {
++                        !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
+                         break;
+                     }
+ 
++                    // Note any pre-base consonants
++                    if ( baseConsonant == lastConsonant && lastConsonant > 0 && 
++                         hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
++                        output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
++                        seenPreBaseForm = TRUE;
++   
++                    }
+                     // consonants with nuktas are never vattus
+                     seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
+@@ -786,10 +828,12 @@
+ 
+             // write any pre-base consonants
++            output.writePreBaseConsonant();
++
+             le_bool supressVattu = TRUE;
+ 
+             for (i = baseLimit; i < baseConsonant; i += 1) {
+                 LEUnicode ch = chars[i];
+-                // Don't put 'blwf' on first consonant.
+-                FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
++                // Don't put 'pstf' or 'blwf' on anything before the base consonant.
++                FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
+ 
+                 charClass = classTable->getCharClass(ch);
+@@ -842,5 +886,5 @@
+ 
+             // write below-base consonants
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 for (i = bcSpan + 1; i < postBase; i += 1) {
+                     output.writeChar(chars[i], i, tagArray1);
+@@ -872,5 +916,5 @@
+             // write post-base consonants
+             // FIXME: does this put the right tags on post-base consonants?
+-            if (baseConsonant != lastConsonant) {
++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+                 if (postBase <= lastConsonant) {
+                     for (i = postBase; i <= lastConsonant; i += 1) {

dev-libs/icu/icu-50.1.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1-r1.ebuild,v 1.5 2013/02/02 10:53:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.2.ebuild,v 1.3 2013/02/06 14:53:22 scarabeus Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-s
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
@@ -25,14 +25,16 @@ S="${WORKDIR}/${PN}/source"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
-	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
-	"${FILESDIR}/${PN}-50.1-no-c++11.patch"
+	"${FILESDIR}/${PN}.7601.Indic-ccmp.patch"
+	"${FILESDIR}/${PN}-50.1.2-bsd.patch"
 )
 
 src_prepare() {
 	local variable
 
 	base_src_prepare
+	epatch -R \
+		"${FILESDIR}/${PN}.8198.revert.icu5431.patch"
 
 	# Do not hardcode flags in icu-config and icu-*.pc files.
 	# https://ssl.icu-project.org/trac/ticket/6102

dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild,v 1.11 2013/02/04 09:45:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild,v 1.12 2013/02/06 19:42:52 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${PV/_}.tar.g
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/gc-${PV/d}/libatomic_ops

dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch

@@ -0,0 +1,14 @@
+http://savannah.gnu.org/bugs/index.php?38273
+http://bugs.gentoo.org/455374
+
+--- configure.ac
++++ configure.ac
+@@ -394,7 +394,7 @@
+ dnl
+ dnl Newest automake workaround - needed for multi-language manual pages
+ dnl
+-AC_SUBST(mkdir_p)
++AC_SUBST(mkdir_p, "${MKDIR_P}")
+ 
+ dnl
+ dnl Output configuration files

dev-libs/libcdio-paranoia/libcdio-paranoia-0.90.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90.ebuild,v 1.5 2013/01/16 10:17:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90.ebuild,v 1.6 2013/02/06 19:32:46 ssuominen Exp $
 
 EAPI=5
 MY_P=${PN}-10.2+${PV}
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch
+	epatch \
+		"${FILESDIR}"/${P}-headers.patch \
+		"${FILESDIR}"/${P}-mkdir_p.patch
+
 	eautoreconf
 }
 

dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.6 2012/10/15 23:30:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.7 2013/02/06 23:25:27 naota Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ else
 	# upstream has no permissions to use some kde written code so repack git
 	# repo every time
 	SRC_URI="http://dev.gentoo.org/~creffett/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"

dev-libs/libpipeline/libpipeline-1.2.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpipeline/libpipeline-1.2.2.ebuild,v 1.7 2013/02/04 10:09:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpipeline/libpipeline-1.2.2.ebuild,v 1.8 2013/02/06 19:48:51 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig

dev-libs/qjson/Manifest

@@ -1,3 +1,2 @@
 DIST qjson-0.7.1.tar.bz2 38075 SHA256 3b8e94345fe846171c4b4d7d3518891d5fc864fda1e0c10d935bdb77bd3db994 SHA512 a3cba247f0a6d2dff38d6ed9ed1da444969faf79fac7979db325b91bcf89eba8a696e1bd072c56aa5bdaef5180f54762e05a0e131d459944499b711f3b04f62b WHIRLPOOL a328b6f161f7215a1580125ed689c5c1cf32a24ba680fd1173a0db0d074a719f40f87829224d5412af3fbc6270a5ba783ee26f347f22bdd7a5afe73d522ff4d1
-DIST qjson-0.7.1_p20121016.tar.bz2 46028 SHA256 84f6deaab8be6eb8b531d6700bd3d9ac4700fa75c2885feee7ed904ad2e63110 SHA512 12faf2d038b945abb1bccbf8f468bdc79708def73e8cec48278747336ef780a449dbccac9ca6ea631ef9428b0e3caf61261c5198ff8702978b148ec56dea1452 WHIRLPOOL 6b210df613b377d9c2ed4c2932c48ddd5db13b0bfd7c4cd310ce664bd3bbeaa53bb5e4ab8b1141516257d1b6fedfccfc246ba266c5e34053e63d3b5b1d998b42
 DIST qjson-0.8.1.tar.bz2 64398 SHA256 cd4db5b956247c4991a9c3e95512da257cd2a6bd011357e363d02300afc814d9 SHA512 03e65bbdf6d397f77319867a03377deb419eac46ad91bc06abb7bc68d8f8f2e490db87d909ce51e065f22e5d201f1f73d57f72e14bc378580dbf40b855f1bc72 WHIRLPOOL 532245b3eaaed901bbf44c1d005b002b010b2b7568142fe1435521e4ed24cb52f76accea9f2a324ed19183c62c2f8bfb0c0a257bf808795fc25faa132766ac32

dev-libs/qjson/metadata.xml

@@ -7,4 +7,3 @@
 		<bugs-to>https://github.com/flavio/qjson/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
-

dev-libs/qjson/qjson-0.7.1-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1-r1.ebuild,v 1.9 2012/05/17 13:14:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1-r1.ebuild,v 1.10 2013/02/06 23:24:35 naota Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND="x11-libs/qt-core:4"

dev-libs/qjson/qjson-0.7.1_p20121016.ebuild

@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1_p20121016.ebuild,v 1.2 2012/10/16 17:17:42 kensington Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="A library for mapping JSON data to QVariant objects"
-HOMEPAGE="http://qjson.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="debug doc test"
-
-RDEPEND="x11-libs/qt-core:4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( x11-libs/qt-test:4 )"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use test QJSON_BUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( doc/html/ )
-	fi
-
-	cmake-utils_src_install
-}

dev-libs/qjson/qjson-0.8.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.8.1.ebuild,v 1.1 2012/12/05 14:02:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.8.1.ebuild,v 1.3 2013/02/06 10:00:47 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="debug doc test"
 
 RDEPEND="x11-libs/qt-core:4"

dev-libs/soprano/Manifest

@@ -1,2 +1,3 @@
 DIST soprano-2.7.6.tar.bz2 1954245 SHA256 28dd05edc21eebaa6f5f2bda773455ecc010ce68026a789549747a8e58cfd732 SHA512 89ba8c2e320a62a83698f449e353956fe3ecd14373d758dbcad006137b8f8a654620fe5dc5c0c2e3f42661d5e1e7d1cd31fe3fb3b841dae16b75ab2a633637a5 WHIRLPOOL f74958180f57496d0ed520e593ecc46a82902b7229e16e447a3c486fe0b3172263cbc03b0e481dd9441f84de21f43042793c8a6db299d9b1d383961aa8d7b7f3
 DIST soprano-2.8.0.tar.bz2 1957014 SHA256 509d35eb10f12596056185051dbd0c94060197b26ebe263aac64653ab55659c7 SHA512 aaec8b90b269ceed60b0c793e48fe9892e71eb95e071c52add47d7902628123d2476c6ad564af92a7c13818cff8b9f30ea1cb3d0663a6834aea8279d3a5b0ddb WHIRLPOOL b03d749d5122bff5b5efbb37cd382ac67ee1aaefee281e9ae1c15acd629c40de29adc08ba1f7ba18a591b743f9a09234ae71ebbb4fc0a3425532198838243e5a
+DIST soprano-2.9.0.tar.bz2 1956448 SHA256 b39323386ede0ed4e8e278540fb9e2725b9f486bbc3975dcaa0eb68d7368e4eb SHA512 27ba4ad98ef00ccb2ec05356df61e1a4fee7f82c93b04f91c260c4a1a2e0d0649345effe00ca692f8a4ca71aa002448bd32fe6cb280f193b7f9b40537f4fbe87 WHIRLPOOL 6b33c25e50aeed9909839269817e667f7d804d8f1177a52a6a8d9c360b1b68393fe334eae3894818ce4d82064789c331107919087235202d4a9294839c7ff516

dev-libs/soprano/soprano-2.9.0.ebuild

@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.9.0.ebuild,v 1.2 2013/02/07 04:12:20 alexxy Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999* ]]; then
+	git_eclass="git-2"
+	EGIT_REPO_URI="git://anongit.kde.org/soprano"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit base cmake-utils flag-o-matic ${git_eclass}
+
+DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
+HOMEPAGE="http://sourceforge.net/projects/soprano"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="+dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
+
+RESTRICT=test
+# bug 281712
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+	raptor? ( >=media-libs/raptor-2.0.4:2 )
+	redland? (
+		>=dev-libs/rasqal-0.9.26
+		>=dev-libs/redland-1.0.14
+	)
+	virtuoso? ( dev-db/libiodbc:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtuoso? ( >=dev-db/virtuoso-server-6.1.6 )
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
+pkg_setup() {
+	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+		echo
+		ewarn "WARNING! This is an experimental ebuild of ${PN} Git tree. Use at your own risk."
+		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		echo
+	fi
+
+	if ! use virtuoso; then
+		echo
+		ewarn "You have explicitly disabled the default soprano backend."
+		ewarn "Applications using soprano may need at least one backend"
+		ewarn "to be functional. If you experience any problems, enable"
+		ewarn "the virtuoso USE flag."
+		echo
+	fi
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarily fix until a better cmake files patch will be provided.
+	use elibc_FreeBSD && append-flags -pthread
+
+	local mycmakeargs=(
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF
+		-DSOPRANO_DISABLE_SESAME2_BACKEND=ON
+		-DSOPRANO_DISABLE_CLUCENE_INDEX=ON
+		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
+		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
+		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+		$(cmake-utils_use test SOPRANO_BUILD_TESTS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc AUTHORS ChangeLog README TODO
+	newdoc backends/virtuoso/README README.virtuoso
+	newdoc backends/sesame2/README README.sesame2
+	if use doc ; then
+		dohtml -r docs/html/
+	fi
+}

dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild

@@ -0,0 +1,205 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild,v 1.1 2013/02/06 10:49:54 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils flag-o-matic
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/ http://pypi.python.org/pypi/matplotlib"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
+
+IUSE="cairo doc excel examples fltk gtk gtk3 latex qt4 test tk wxwidgets"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+
+PY2_USEDEP=$(python_gen_usedep python2*)
+COMMON_DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng
+	gtk? ( dev-python/pygtk[${PY2_USEDEP}] )
+	gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	wxwidgets? ( dev-python/wxpython:2.8[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/imaging[${PY2_USEDEP}]
+		dev-python/ipython
+		dev-python/xlwt[${PY2_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/pyparsing[${PYTHON_USEDEP}]
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+	)
+	qt4? ( || ( dev-python/PyQt4[X,${PYTHON_USEDEP}] dev-python/pyside[X,${PYTHON_USEDEP}] ) )"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2*) )"
+REQUIRED_USE="doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )"
+
+RESTRICT="mirror"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+	# remove internal copies of pyparsing
+	rm lib/matplotlib/pyparsing{_py2,_py3}.py || die
+
+	sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	local PATCHES=(
+		# avoid checks needing a X display
+		"${FILESDIR}"/${P}-setup.patch
+
+		# Fix test, issue no. 1532
+		"${FILESDIR}"/${P}-ft-refcount.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<-EOF || die
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		$(use_setup cairo)
+		$(use_setup qt4)
+		$(use_setup tk)
+	EOF
+
+	if [[ ${EPYTHON} == python3* ]]; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	unset DISPLAY # bug #278524
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		"${PYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	local test_dir="${BUILD_DIR}"/tests/lib
+	mkdir -p "${test_dir}" || die
+	local PYTHONPATH=${test_dir}:${PYTHONPATH}
+	export PYTHONPATH
+
+	wrap_setup esetup.py install --install-lib="${test_dir}"
+
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -c "
+import sys, matplotlib as m
+sys.exit(0 if m.test(verbosity=2) else 1)
+" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc -r doc/build/{latex/Matplotlib.pdf,html}
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}

dev-python/oauthlib/Manifest

@@ -1,3 +1,4 @@
 DIST oauthlib-0.1.3.tar.gz 24684 SHA256 6066c9c0ab07953f98870bc97d29f6defd066b6c215de74b9976666f3f6c3d40 SHA512 08153dfbad31616e6ee88d748c50626fcf62d72148c623a6589ab3124e9d2108fe37cf283db7f2116dd163fc45d8d4fa244a462a2fd9f13671a92eec42f08fb7 WHIRLPOOL d8e698de73626921f127895950d526bcb15749d5caed3405883fb6790d73732ea25fce24bf4b51da918866ceda484f2db64e2da2be74b4830f0a4fae4115bb56
 DIST oauthlib-0.3.0.tar.gz 43581 SHA256 8c62a18370b87fda3299bad4d4af2949e1bcb2d65519887ffcdcbcd00dfa9bf0 SHA512 7f69cc80cbaa9161e7b562bef475ea912373a0a1c2a84ee7d19d724db6e0f9d0f38cc9cf95672efcbf9e9200f7b4650a75ab8205fe004e6cdebf65fbddef7771 WHIRLPOOL 37e6e892fc451ad28ae650a6da89109c17495ca7a2453b4fddc99fd5773fb19d1f16f0889f181e7de17032156a5fe3c56751c50b8bc380287b330c0278ede7c9
 DIST oauthlib-0.3.4.tar.gz 54799 SHA256 7f3a2bc708c9667aa9e5071bde10bcaa1c07218b4f0c777383a98478ef47bdd3 SHA512 8cefd8120df5e1bc97de057c9771882d56afc0cfe2bf0025452c8f25a43723935b34edd108c5de3a54acb141577ee57e294d4621ef83a0bbf981788b7f89eaca WHIRLPOOL 92abbf92e68ca1f9b593d062f61bd18f9c16ac1796b1eee3257bf3620e607191e984d4760195a9671dc8fe3924df4acdbc1673456e84c4731a91ac14f67add53
+DIST oauthlib-0.3.6.tar.gz 62998 SHA256 0724d48d8a6d0f749ce67004a547335c042adf988d9748b0c8d792151cbceffc SHA512 f8ee1c56a800f6ccf2c987c33c4a08e083cddd24d43953d2e952e22fcaeae3128b5ee438ec572dba6561ef24cd71bfcc616c8a8452a56faffdbdcfcc1cbf4d62 WHIRLPOOL 3be38f2ee74b9c1cd2f2dc25c0bba11cf4ae64065eb2853c94ffa7a5237d11fe53e36244cd03264a16764f7ad414e00be6f2d1aa167e0a861d4590d37cfb6898

dev-python/oauthlib/oauthlib-0.3.6.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.6.ebuild,v 1.1 2013/02/06 06:53:37 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib http://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+# >=pycrypto-2.6-r1 for python3 support
+# unittest2 for python2 compat
+RDEPEND=">=dev-python/pycrypto-2.6-r1"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests || die
+}

dev-python/paver/Manifest

@@ -1,3 +1 @@
-DIST Paver-1.0.4.tar.gz 270958 SHA256 7410a24d501870fa4cdce5dead4729650e2594fcdfb5a479f79c3f70896328f1 SHA512 6a65fcfd13af562f08f38c023fc3276daab69b87f9ec0746cf91b39a82e27d57a696d2fa0f48b997a7c460f79d6fd9116445911d884d0f5543aaa3c2a3112d19 WHIRLPOOL 6816060f74e87195c9f413196d9c7b2426318822e66b4eae3700f5feac78d5c4677426f1e007b41c54fd1f0dd3b12142344ef811a2b1ac03c4db6b164e34e4e2
-DIST Paver-1.0.5.tar.gz 271147 SHA256 43ba0644a1412629cdc54b6b177f2b6f4337031b8556ab27a73f0f48ebb1496e SHA512 83f462d3ec2b1640684c24ba3b02ec8e6bb1e60f364e450b5859e15b10822359f539664fdcab90c81a86cab829da4803ae31f3dc25184c363959cab173320c91 WHIRLPOOL 0d449329b380bca588d77aa684d2a75817ebab7c87a4e16e54939bcc4e7417fbb43d59247906a60c47043435c31dfafe3f9831cff342244f9787573b7fdd6606
 DIST Paver-1.1.1.tar.gz 304881 SHA256 7a269091c3c82dc0b862ad70e26031225c2569bca89f0913f39c766c6c8e2f7e SHA512 fd9b44ee826b47352381ebd6c79938a64f271cf2a31ea2cab591316d671066447b0df003fd535176f67bf911dcc008ae0660302ea6c637ab771f5e2c9b80f2e2 WHIRLPOOL 4ac6f7a267569395768451ebdb098f246672fb42b8aad9d09d36d03a5bf484bc3845703d4aee91cf87538dbc1105653f57ca64314db0351b3e3f1a01324cd81e

dev-python/paver/paver-1.0.4-r1.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.0.4-r1.ebuild,v 1.1 2011/09/13 04:23:47 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="${PN/p/P}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python-based software project scripting tool along the lines of Make"
-HOMEPAGE="http://www.blueskyonmars.com/projects/paver/ http://pypi.python.org/pypi/Paver"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="README.txt"
-
-src_install() {
-	distutils_src_install
-	rm -f "${ED}usr/lib/python2.4/site-packages/paver/path25.py" || die
-}