[gentoo-commits] dev/axs:master commit in: dev-perl/common-sense/, app-misc/tracker/files/, app-backup/spideroak-bin/, ...

[Ian Stakenvicius]

commit:     30fa89089a60e02c115456a2602c688d4876c2c1
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 20:28:02 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 20:28:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=30fa8908

Sync with tree 2012-09-28 ~17:00UTC , removed some unnecessary updates

---
 app-backup/spideroak-bin/Manifest                  |   18 --
 app-backup/spideroak-bin/files/headless.patch      |    9 -
 app-backup/spideroak-bin/files/opt-path.patch      |   12 -
 .../files/spideroak-bin-4.7.9948-headless.patch    |    8 -
 .../files/spideroak-bin-4.7.9948-opt-path.patch    |   13 -
 .../spideroak-bin/spideroak-bin-4.1.9860.ebuild    |   95 -------
 .../spideroak-bin/spideroak-bin-4.5.9941.ebuild    |  156 ------------
 .../spideroak-bin/spideroak-bin-4.6.9945.ebuild    |  156 ------------
 .../spideroak-bin/spideroak-bin-4.7.9948.ebuild    |  156 ------------
 app-misc/tracker/Manifest                          |   20 +-
 .../files/tracker-0.14.2-icu-no-LC_ALL.patch       |   27 +--
 app-misc/tracker/tracker-0.10.27.ebuild            |  203 ---------------
 app-misc/tracker/tracker-0.10.35.ebuild            |    8 +-
 app-misc/tracker/tracker-0.12.10-r1.ebuild         |    8 +-
 app-misc/tracker/tracker-0.12.10.ebuild            |    8 +-
 app-misc/tracker/tracker-0.14.1.ebuild             |  264 --------------------
 app-misc/tracker/tracker-0.14.2-r1.ebuild          |   66 +++--
 app-misc/tracker/tracker-0.14.2.ebuild             |    8 +-
 app-misc/tracker/tracker-9999.ebuild               |   62 +++--
 app-office/libreoffice/Manifest                    |   10 +-
 app-office/libreoffice/libreoffice-3.5.6.2.ebuild  |    4 +-
 app-office/libreoffice/libreoffice-3.6.2.2.ebuild  |    4 +-
 app-office/libreoffice/libreoffice-3.6.9999.ebuild |    4 +-
 app-office/libreoffice/libreoffice-9999-r2.ebuild  |    7 +-
 dev-java/icedtea/Manifest                          |    6 +-
 dev-java/icedtea/icedtea-6.1.11.4.ebuild           |    3 +-
 dev-java/icedtea/icedtea-7.2.3.2.ebuild            |    3 +-
 .../Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild |    8 +-
 dev-perl/Alien-wxWidgets/Manifest                  |    2 +-
 .../DateTime-TimeZone-1.500.0.ebuild               |    2 +-
 dev-perl/DateTime-TimeZone/Manifest                |    2 +-
 dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild |    2 +-
 dev-perl/Devel-NYTProf/Manifest                    |    2 +-
 dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild            |    4 +-
 dev-perl/JSON-XS/Manifest                          |    4 +-
 dev-perl/Text-Table/Manifest                       |    2 +-
 dev-perl/Text-Table/Text-Table-1.126.0.ebuild      |    2 +-
 dev-perl/Wx-Scintilla/Manifest                     |    2 +-
 dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild  |    2 +-
 dev-perl/common-sense/Manifest                     |    6 +-
 dev-perl/common-sense/common-sense-3.500.0.ebuild  |    4 +-
 dev-perl/common-sense/common-sense-3.600.0.ebuild  |    4 +-
 dev-perl/wxperl/Manifest                           |    2 +-
 dev-perl/wxperl/wxperl-0.991.200.ebuild            |    2 +-
 dev-util/geany-plugins/Manifest                    |    2 +-
 .../geany-plugins/geany-plugins-1.22-r1.ebuild     |    4 +-
 dev-util/geany/Manifest                            |    1 -
 dev-util/geany/geany-1.22.ebuild.rej               |   11 -
 media-gfx/feh/Manifest                             |    6 +-
 media-gfx/feh/feh-2.6.2.ebuild                     |    4 +-
 .../feh/{feh-2.6.2.ebuild => feh-2.6.3.ebuild}     |    8 +-
 media-gfx/graphite2/Manifest                       |    2 +-
 media-gfx/graphite2/graphite2-1.2.0.ebuild         |    4 +-
 media-libs/libpng/Manifest                         |   12 +-
 media-libs/libpng/libpng-1.2.49.ebuild             |    4 +-
 media-libs/libpng/libpng-1.2.50.ebuild             |    4 +-
 media-libs/libpng/libpng-1.5.10.ebuild             |    4 +-
 media-libs/libpng/libpng-1.5.11.ebuild             |    4 +-
 media-libs/libpng/libpng-1.5.12.ebuild             |    4 +-
 media-video/clive/Manifest                         |    8 -
 media-video/clive/clive-2.2.26.ebuild              |   47 ----
 media-video/clive/clive-2.2.28.ebuild              |   47 ----
 media-video/clive/clive-2.2.6.ebuild               |   45 ----
 media-video/mplayer2/Manifest                      |    8 +-
 media-video/mplayer2/mplayer2-2.0_p20120828.ebuild |    4 +-
 media-video/mplayer2/mplayer2-9999.ebuild          |    4 +-
 net-misc/nx/Manifest                               |    2 +-
 net-misc/nx/nx-3.5.0.15.ebuild                     |    4 +-
 net-misc/youtube-viewer/Manifest                   |    2 +-
 .../youtube-viewer-3.0.1_p20120924.ebuild          |    2 +-
 x11-drivers/nvidia-drivers/Manifest                |    2 +-
 .../nvidia-drivers/nvidia-drivers-304.51.ebuild    |    4 +-
 x11-drivers/xf86-video-mga/Manifest                |    4 +-
 .../xf86-video-mga/xf86-video-mga-1.6.2.ebuild     |   20 ++
 x11-drivers/xf86-video-r128/Manifest               |    4 +-
 .../xf86-video-r128/xf86-video-r128-6.9.1.ebuild   |   21 ++
 76 files changed, 253 insertions(+), 1439 deletions(-)

diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
deleted file mode 100644
index 67a41fe..0000000
--- a/app-backup/spideroak-bin/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX headless.patch 382 SHA256 a3869eec6d9837613bddfa3a3bdde8737bbb5b3c47fede28c2de7e412e5a56f4 SHA512 cec603c204de5ae27006dcffb43a4e56cfc506bd418b2bf2987c7b786db2e0929e4aef95d83a18acb9f8fdb46aa7c35f30650cd9f61ab87a7b1b73f04170f2df WHIRLPOOL f9b6246b92096fe1f451ac5d0d855aa810056c89371d0f08d6fad2dcd2854fab23dbc094e8cac127c45fb1fda017cb1579ae489a663137b3644408fa8fb72b1f
-AUX opt-path.patch 451 SHA256 a0ad54882ef97b75e74e1dcbe5684014f2b19b630a933bb8138286c8929e3576 SHA512 edb60956155c1ac952796f7f846103fe80bc7d11618b40f29e34fbf9ed03e1cc81008ad0eedaf7b7024f24dcceda37f7edead6f31d473741e0445792c6f18086 WHIRLPOOL 7c076afacc1f9fb80f8cdbd24845b792d77db1d5603218f729e1b87331e9644f65d96d2b3165a50757d8f3b078dd9f91faa3b16ed0c37579aab33760ccfbd6c0
-AUX spideroak-bin-4.7.9948-headless.patch 353 SHA256 b9db5b3ebdba8e2b3e36c78b133a3ce3d17d5784bbbcf906b8e61b383a19886d SHA512 aab0d738d567504fa4b65dc8e17d24cac8dc92f4a805924c50bb2fc68531d372e3061df080598ab09a8b6dbdc337764f927333b958af8fa8e00a6d34b4be32f4 WHIRLPOOL 59c4884cb3a3c5f5983dbf1fc4591e0f69f7f106b9721dbff9eb552249155a436f7742bcc12d9dc7b9845f54042ce1276d41e7eda757ef8dd72d72b325aff57c
-AUX spideroak-bin-4.7.9948-opt-path.patch 489 SHA256 f1e15bd47107d3f40004140b0e0e67d7936fcb86dea55e91e0c7651842aa4eaf SHA512 71912bdc30a735c50ea7204bdee2f94585260f752ba68677c74295c47ca01236be3cf7ec1910d0dbcc892ee2d41e2a53dea611379b78b9d791efd7af662c4df6 WHIRLPOOL 815a1825cb4a74fb93202907b3579efdb66f8d8f55753042d848c69cce964e615f535c919a40de520752247acd3b847603bbc486ab689ecd92b90ea4eef97ade
-DIST spideroak-bin-4.1.9860_amd64.deb 24201826 SHA256 3f6ba38c3793391dc679953f65cefc3e58017650ffc83251a1c54f4c09bfec6f SHA512 c287f8bb697c51f10800c1763b8d246151760e1b55db4db5c60e30524dc100049b697feb60c69569383971f4981d9d85cc6443e6b8abac0b20620c28a19a73c2 WHIRLPOOL ff4b2b81bab27c251613b2d33ec395b75017f4a4ced2a713f26712a61a078ae95d5a0f58e2bd14e2795d6317ea630e6305db73f753b5dabb0ae081823c217779
-DIST spideroak-bin-4.1.9860_x86.deb 23635590 SHA256 2850bddf8a227e14b6b4fc1590e3a1c49ee5a31d23d154610785daaf1aa52df1 SHA512 e972a1a7fe7b63c69e061b9be74f0e56e3fae282fa6b84e3a1e57629f521952bdf134ea173df492952e39f4fd3547e995af1eea04309459a86dd498df21de7c3 WHIRLPOOL 34401905c258e52e3131df40c5e75350a3f5616948bfe2985109e12cef175e5e0c3e602628b1bd46db3c3f062a20be83f508bcd60958684eb84b40ce425feee4
-DIST spideroak-bin-4.5.9941_amd64.deb 24625808 SHA256 9426dcc8c8fa59fa2cb40f3688aac304439aeb0c61fcee0c2b01f66a0550705c SHA512 bde7dda2f33e70ff5aeac291147e6c73b3d6b059d35e1b7da029321491579df65e35b72873bdae057eb11d45c3595dbe8718f8e51df630583495bc6981bf0ef1 WHIRLPOOL 4e831e0abf74be7f816c985b863a160519939671c80c6646e6e10a82b79f171493dde44292d7c0f963335baba1525adfcba23615e45e872bb6fbf82f63ec86d7
-DIST spideroak-bin-4.5.9941_x86.deb 24026748 SHA256 308942ee3094dc8ea33752c6cbe06d1b26e0b70dda651b25c20f30238d85facc SHA512 b36a3c3e2836a81c43c34564fb73f06a8294278d73e19636fec5a67bd1687e5692db3901a50e01145fa8ec1fd6abdfcf51d698b2a034aa08a394ed8d63b7e024 WHIRLPOOL 5d885dff5d7e3c16d1a26982c45cd55477541dc930452206c958aa0f8ba16a7e2716f3a2e45328853333a36d37432b449c1007f38a699c5fc618554f7645132c
-DIST spideroak-bin-4.6.9945_amd64.deb 22739354 SHA256 28974dcd6be298fa91a1d9f998cc34f8fdd63b513c9d0215e3673f16c69d6a78 SHA512 9aad5ee61c8aa1b68c6d687c4cfc91b09153c1d274269f2ffdbeb2eecb194468f797e1d2963b630bb85e35d654138672267fc8697f09d950acb24b202e7a5f37 WHIRLPOOL 10d6ae22add7a45eff6ee4dbbc67caa50e52cb183e12559ba7dfda9babdfbafa99243af9fd2176cb58dd18ddb1b40619b073251ad9ba294250464682dc3b004e
-DIST spideroak-bin-4.6.9945_x86.deb 22135372 SHA256 7dd15a12388324b59641a8f9cd1625568eec0b75ac7d9cf72b65afd6baa11c1e SHA512 2fe5dd1fe422390a55d774fd4f285d5d10342e5671e0053b7889764c1b3e67b48fbbc1eea01dafc34630496d0cc7010a11179e72c1522c6acdcdb0c8d9a3a00c WHIRLPOOL 79542052dad632713d2cdaa4e1589856ef15bf076be9568dab4e7713bf9597ffeb08eda6fa761fa4c45b1353d39de93570f0415cd6e7f846fb1c60688f40d14c
-DIST spideroak-bin-4.7.9948_amd64.deb 22739294 SHA256 643fe98a02635f37b2a4122eb81679954291a53e67af959e6d24c26aa737536b SHA512 5a6de79066087adccd3d89af17cc40254809e9cd5f12ccb1daada340e7b357d33d7e25179a54f700f8100abc91fc4e16a729726d549ca624fdad0a42183314f8 WHIRLPOOL e9376610a9811c68ad3230597d66578864e095e9fde9cf77eee6808a3409e0cff6e2f0548e625cd158a37cbd256dddb54520b4354de27008003c361ecd87465b
-DIST spideroak-bin-4.7.9948_x86.deb 22132538 SHA256 a7b6d44d0197e46334646db9a2015d2987cd4c9a8b77423284044092265bfa8d SHA512 45f93a40bfc2227573aabb4ae9d820fe832726dce512435e9ef34d2d82a234a729313bfb83f340a00de3955e7c08f851915626eed2d02c767dc6949e9c8f74ed WHIRLPOOL 6b4220b1c790e65e5b0ce96acd8aa459848a0c14fa9e216816ecce12fe3576601feb3e10afe036d4f537cc62c96f069043ab61a07b9e7abd5ab9568483ad975a
-EBUILD spideroak-bin-4.1.9860.ebuild 2742 SHA256 5552110234c740128d1566157a9c80a433ad0e86204fa51631ba35d9376f9a06 SHA512 f5f724e88867e0a1a4d5e0db1c94077fbc9f421487208546f6602a8e7fa94db447eed94244c3abc091ec2e30ca90f30d781071c0c0057420eefcef0e3e034f2d WHIRLPOOL 906769ae845b24d078c4d2a5bb3ebb4fa46d87be238d76ef056274a06c0f39c8c5f460b60f9532bb25ff645abff357625367f14aa8c05d6c3d59ec92bc01a2a2
-EBUILD spideroak-bin-4.5.9941.ebuild 4404 SHA256 6d4ddc8fd6c54d5b69f818a9ee456af1bc0765bea9027066916682967e0e63cb SHA512 a7f4e9626dbfd101e1c307b477b442e2ba7bde4d741f630c42e294cc0b98d323095d5fc62efe4db4a2ac288be149a895724cb40b0bae91a5abb098f71007d251 WHIRLPOOL ba57c845a141c74ce8f003855c62468914c6575be0bb1cb1fceac6db7b4eb2064a6f049f974838ebb6ebd8927e92ed2a2d497a56b50badeadca03ce8a7498be2
-EBUILD spideroak-bin-4.6.9945.ebuild 4404 SHA256 c7bd882bc1fd41c5b968f11bcb7a656373a3e8c8f1efcb845d8b1009ed069a6b SHA512 0a9e9520b1088ed0607c9d035248f39565de3b49cca75f5a26ed3836b2a783d06ba6f8ebc285fdf4bdd24b5328c47e8aa846543ab347aee560ae977173debf2c WHIRLPOOL f538722d8a8e501b748690770b72e3b4560fa5dc840089381366f8e8cb36f77dd0ca0ac1f96e2343a85de6a425e4be224d0bc422fb9ac4810a5f281f2b78af22
-EBUILD spideroak-bin-4.7.9948.ebuild 4414 SHA256 b20b91df3a5e50410bdfeae04240113d3207ef69f0b2796390a6193ac774320b SHA512 3f20ee97fae05a2c1745f7794a5ce03cf9ea7a066b4c7f04f27eb13144bd0bf98cf5b2de764c8a9bad88feceabf960ad37b6eaf907fade0611ae1618c8efa4b1 WHIRLPOOL d473b063a55fae3d4c654afdb790780524957778126247e6e807fe2e47d3923173a11b1835054af23460ea9933008a33c94200d2c774bd35f6516f4b5a6c6f86
-MISC ChangeLog 4960 SHA256 49c0cd74b15248e59e2dbc6c9dddee102d8bad5596e105329f9167b0860b527c SHA512 c5dc48be519175df94a8e7434d879fbbe485fb36a415f49ee390d7d7e8e17193916f94e46bce1e42907f84559de56efd7e4f7bf9071a866c41762230d0ed0533 WHIRLPOOL 95d470c88dc719c30f799cc5287d2b11125973110c0901af77224ea832c7b2f97c10e6d52771cb1d10e78cdcd1a4502089a76fd12abf57b5f98c2c48d44f9e6d
-MISC metadata.xml 710 SHA256 636c0dc16c258dcc3155e90ffd56530722c6bcb6e11da9a9f6e407176b89b253 SHA512 8484e7fae76e440656d6cdb3888a4db0413702f9c5a26be92b78b73ba2cf272e8d3e570be11162c424e5dba4e151e50016f516cf6920e2dd31a0f9cf4f95f389 WHIRLPOOL 2b7cf9e5c202f7592d487462ab47c59525cba98940223d5815db3dfd0bf0938683f02e66042efacbd340f7f1a2c21502d5e28b977131819053cbd6f2f15136f9

diff --git a/app-backup/spideroak-bin/files/headless.patch b/app-backup/spideroak-bin/files/headless.patch
deleted file mode 100644
index e1b6c46..0000000
--- a/app-backup/spideroak-bin/files/headless.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur usr/bin/SpiderOak usr/bin/SpiderOak
---- usr/bin/SpiderOak	2012-01-21 19:32:02.000000000 -0500
-+++ usr/bin/SpiderOak	2012-01-21 19:32:57.000000000 -0500
-@@ -3,4 +3,4 @@
- LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
--exec "/opt/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" --headless "$@"

diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/spideroak-bin/files/opt-path.patch
deleted file mode 100644
index adee3e1..0000000
--- a/app-backup/spideroak-bin/files/opt-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/usr/bin/SpiderOak b/usr/bin/SpiderOak
---- a/usr/bin/SpiderOak	2011-12-26 16:27:35.000000000 -0500
-+++ b/usr/bin/SpiderOak	2012-01-09 10:04:03.000000000 -0500
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
--exec "/usr/lib/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" "$@"

diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch
deleted file mode 100644
index 1ba7c08..0000000
--- a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-headless.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- usr/bin/SpiderOak.orig	2012-08-26 08:10:42.387011624 +0200
-+++ usr/bin/SpiderOak	2012-08-26 08:10:48.899956298 +0200
-@@ -5,4 +5,4 @@
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
- SpiderOak_EXEC_SCRIPT=$(cd `dirname $0` ; pwd)/SpiderOak
- export SpiderOak_EXEC_SCRIPT
--exec "/opt/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" --headless "$@"

diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch
deleted file mode 100644
index afdbc33..0000000
--- a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-opt-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- usr/bin/SpiderOak.orig	2012-08-15 17:03:09.697548990 +0200
-+++ usr/bin/SpiderOak	2012-08-15 17:03:54.637356071 +0200
-@@ -1,8 +1,8 @@
- #!/bin/sh
- 
--LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
- SpiderOak_EXEC_SCRIPT=$(cd `dirname $0` ; pwd)/SpiderOak
- export SpiderOak_EXEC_SCRIPT
--exec "/usr/lib/SpiderOak/SpiderOak" "$@"
-+exec "/opt/SpiderOak/SpiderOak" "$@"

diff --git a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
deleted file mode 100644
index 1396392..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.4 2011/12/14 18:18:10 ago Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus headless qt-bundled"
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	dbus? ( sys-apps/dbus )
-	>=sys-devel/gcc-4
-	>=sys-libs/glibc-2.7
-	!headless? (
-		>=media-libs/fontconfig-2.4.0
-		>=media-libs/freetype-2.3.5
-		>=x11-libs/libICE-1.0.0
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		!qt-bundled? ( x11-libs/qt-gui:4[accessibility,dbus] )
-	)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-}
-
-src_prepare() {
-	# change /usr/ to /opt/SpiderOak/ in start script
-	sed -i 's:/usr/lib:/opt:g' usr/bin/SpiderOak || die "sed failed"
-	# change /usr/ to /opt/ in .desktop file
-	sed -i 's:/usr/bin/SpiderOak:/opt/bin/SpiderOak:g' usr/share/applications/spideroak.desktop || die "sed failed"
-
-	# disable GUI if headless useflag is enabled
-	if use headless; then
-		sed -i 's:"$@":--headless "$@":' usr/bin/SpiderOak || die "sed failed"
-	fi
-
-	# remove shipped libstdc++.so.6 as it does not provide LIBCXX_3.4.11
-	# and it seems to work alright with the one from >=gcc-4
-	rm usr/lib/SpiderOak/libstdc++.so.6 || die "rm libstdc++.so.6 failed"
-
-	if ! use qt-bundled || use headless; then
-		# rm precompiled and bundled qt libs
-		rm usr/lib/SpiderOak/libQt*.so.4 || die "rm libQt*.so.4 failed"
-	fi
-}
-
-src_install() {
-	insinto /opt/SpiderOak
-	doins -r usr/lib/SpiderOak/*
-
-	exeinto /opt/SpiderOak
-	doexe usr/lib/SpiderOak/SpiderOak
-
-	exeinto /opt/bin
-	doexe usr/bin/SpiderOak
-
-	if use dbus; then
-		insinto /etc/dbus-1
-		doins -r etc/dbus-1/*
-	fi
-
-	if ! use headless; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/spideroak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless ; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
-		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
-	fi
-}

diff --git a/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild
deleted file mode 100644
index c3f1d34..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild,v 1.2 2012/07/26 17:19:26 kensington Exp $
-
-EAPI="5"
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless system-libs"
-
-SSL_SLOT="0.9.8"
-
-DEPEND=""
-RDEPEND="
-	dbus? ( sys-apps/dbus )
-	!headless? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		dev-libs/glib:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	system-libs? (
-		dev-libs/openssl:$SSL_SLOT
-		net-misc/curl
-		>=sys-devel/gcc-4
-		dev-libs/glib:2
-		dev-libs/libpcre
-		media-libs/libpng:1.2
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		dev-db/sqlite:3
-		net-libs/libssh2
-		sys-libs/zlib
-		dev-lang/python:2.7
-		dev-python/pycurl
-	)
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/opt-path.patch
-	use headless && epatch "${FILESDIR}"/headless.patch
-
-	# Remove bundled libraries/plugins/python interpreter.  Please keep this
-	# mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
-	# list of deleted files below
-	#
-	#  libcrypto.so.0.$SSL_SLOT  => dev-libs/openssl:$SSL_SLOT
-	#  libssl.so.$SSL_SLOT       => dev-libs/openssl:$SSL_SLOT
-	#  libcurl.so*     => net-misc/curl
-	#  libexpat.so*    => dev-libs/expat
-	#  libgcc_s.so     => >=sys-devel/gcc-4
-	#  libstdc++.so*   => >=sys-devel/gcc-4
-	#  libpcre.so*     => dev-libs/libpcre
-	#  libpng12*:=       => media-libs/libpng:1.2
-	#  libQt*.so*      => x11-libs/qt-core x11-libs/qt-gui
-	#  libsqlite3.so*  => dev-db/sqlite:3
-	#  libssh2.so*     => net-libs/libssh2
-	#  libz.so*        => sys-libs/zlib
-	#
-	#  pycurl.so       => dev-python/pycurl
-	#
-	#  usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7
-	#
-	if use system-libs; then
-		for lib in                 \
-			libcrypto.so.$SSL_SLOT \
-			libssl.so.$SSL_SLOT    \
-			libcurl.so*            \
-			libexpat.so*           \
-			libgcc_s.so*           \
-			libpcre.so*            \
-			libpng12*:=              \
-			libQt*.so*             \
-			libsqlite3.so*         \
-			libssh2.so*            \
-			libstdc++.so*          \
-			libz.so*               \
-			pycurl.so              \
-			pyexpat.so
-		do
-			rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
-		done
-
-		# Remove bundled python interpreter => dev-lang/python:2.7
-		rm usr/lib/SpiderOak/py || die "rm py failed"
-	fi
-}
-
-src_install() {
-	#install the executable script
-	exeinto /usr/bin
-	doexe usr/bin/SpiderOak
-
-	#install the prebundled libraries
-	dodir /opt
-	cp -pPR usr/lib/SpiderOak "${ED}"/opt/
-
-	#install the config files
-	rm -rf etc/apt
-	use dbus || rm -rf etc/dbus-1
-	insinto /
-	doins -r etc
-
-	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
-
-	if ! use headless ; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/spideroak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
-		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
-	fi
-	if use system-libs; then
-		einfo "You have chosen to use your system libraries rather than the precompiled libraries that"
-		einfo "SpiderOak bundles with their software.  While upstream discourages this (see bug #398313),"
-		einfo "there are advantages to using the system libraries, like reducing the size of the package"
-		einfo "on your hard drive.  For more reasons why bundled librars are not a good idea, see"
-		einfo "  https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries"
-	fi
-}

diff --git a/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild
deleted file mode 100644
index 781e108..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild,v 1.2 2012/07/26 17:19:26 kensington Exp $
-
-EAPI="5"
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless system-libs"
-
-SSL_SLOT="0.9.8"
-
-DEPEND=""
-RDEPEND="
-	dbus? ( sys-apps/dbus )
-	!headless? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		dev-libs/glib:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	system-libs? (
-		dev-libs/openssl:$SSL_SLOT
-		net-misc/curl
-		>=sys-devel/gcc-4
-		dev-libs/glib:2
-		dev-libs/libpcre
-		media-libs/libpng:1.2
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		dev-db/sqlite:3
-		net-libs/libssh2
-		sys-libs/zlib
-		dev-lang/python:2.7
-		dev-python/pycurl
-	)
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/opt-path.patch
-	use headless && epatch "${FILESDIR}"/headless.patch
-
-	# Remove bundled libraries/plugins/python interpreter.  Please keep this
-	# mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
-	# list of deleted files below
-	#
-	#  libcrypto.so.0.$SSL_SLOT  => dev-libs/openssl:$SSL_SLOT
-	#  libssl.so.$SSL_SLOT       => dev-libs/openssl:$SSL_SLOT
-	#  libcurl.so*     => net-misc/curl
-	#  libexpat.so*    => dev-libs/expat
-	#  libgcc_s.so     => >=sys-devel/gcc-4
-	#  libstdc++.so*   => >=sys-devel/gcc-4
-	#  libpcre.so*     => dev-libs/libpcre
-	#  libpng12*:=       => media-libs/libpng:1.2
-	#  libQt*.so*      => x11-libs/qt-core x11-libs/qt-gui
-	#  libsqlite3.so*  => dev-db/sqlite:3
-	#  libssh2.so*     => net-libs/libssh2
-	#  libz.so*        => sys-libs/zlib
-	#
-	#  pycurl.so       => dev-python/pycurl
-	#
-	#  usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7
-	#
-	if use system-libs; then
-		for lib in                 \
-			libcrypto.so.$SSL_SLOT \
-			libssl.so.$SSL_SLOT    \
-			libcurl.so*            \
-			libexpat.so*           \
-			libgcc_s.so*           \
-			libpcre.so*            \
-			libpng12*:=              \
-			libQt*.so*             \
-			libsqlite3.so*         \
-			libssh2.so*            \
-			libstdc++.so*          \
-			libz.so*               \
-			pycurl.so              \
-			pyexpat.so
-		do
-			rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
-		done
-
-		# Remove bundled python interpreter => dev-lang/python:2.7
-		rm usr/lib/SpiderOak/py || die "rm py failed"
-	fi
-}
-
-src_install() {
-	#install the executable script
-	exeinto /usr/bin
-	doexe usr/bin/SpiderOak
-
-	#install the prebundled libraries
-	dodir /opt
-	cp -pPR usr/lib/SpiderOak "${ED}"/opt/
-
-	#install the config files
-	rm -rf etc/apt
-	use dbus || rm -rf etc/dbus-1
-	insinto /
-	doins -r etc
-
-	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
-
-	if ! use headless ; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/spideroak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
-		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
-	fi
-	if use system-libs; then
-		einfo "You have chosen to use your system libraries rather than the precompiled libraries that"
-		einfo "SpiderOak bundles with their software.  While upstream discourages this (see bug #398313),"
-		einfo "there are advantages to using the system libraries, like reducing the size of the package"
-		einfo "on your hard drive.  For more reasons why bundled librars are not a good idea, see"
-		einfo "  https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries"
-	fi
-}

diff --git a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild
deleted file mode 100644
index 0e5303e..0000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.2 2012/08/27 01:46:36 blueness Exp $
-
-EAPI="5"
-
-inherit eutils versionator
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system."
-HOMEPAGE="https://spideroak.com"
-SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless system-libs"
-
-SSL_SLOT="0.9.8"
-
-DEPEND=""
-RDEPEND="
-	dbus? ( sys-apps/dbus )
-	!headless? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		dev-libs/glib:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	system-libs? (
-		dev-libs/openssl:$SSL_SLOT
-		net-misc/curl
-		>=sys-devel/gcc-4
-		dev-libs/glib:2
-		dev-libs/libpcre
-		media-libs/libpng:1.2
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		dev-db/sqlite:3
-		net-libs/libssh2
-		sys-libs/zlib
-		dev-lang/python:2.7
-		dev-python/pycurl
-	)
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-opt-path.patch
-	use headless && epatch "${FILESDIR}"/${PF}-headless.patch
-
-	# Remove bundled libraries/plugins/python interpreter.  Please keep this
-	# mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
-	# list of deleted files below
-	#
-	#  libcrypto.so.0.$SSL_SLOT  => dev-libs/openssl:$SSL_SLOT
-	#  libssl.so.$SSL_SLOT       => dev-libs/openssl:$SSL_SLOT
-	#  libcurl.so*     => net-misc/curl
-	#  libexpat.so*    => dev-libs/expat
-	#  libgcc_s.so     => >=sys-devel/gcc-4
-	#  libstdc++.so*   => >=sys-devel/gcc-4
-	#  libpcre.so*     => dev-libs/libpcre
-	#  libpng12*:=       => media-libs/libpng:1.2
-	#  libQt*.so*      => x11-libs/qt-core x11-libs/qt-gui
-	#  libsqlite3.so*  => dev-db/sqlite:3
-	#  libssh2.so*     => net-libs/libssh2
-	#  libz.so*        => sys-libs/zlib
-	#
-	#  pycurl.so       => dev-python/pycurl
-	#
-	#  usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7
-	#
-	if use system-libs; then
-		for lib in                 \
-			libcrypto.so.$SSL_SLOT \
-			libssl.so.$SSL_SLOT    \
-			libcurl.so*            \
-			libexpat.so*           \
-			libgcc_s.so*           \
-			libpcre.so*            \
-			libpng12*:=              \
-			libQt*.so*             \
-			libsqlite3.so*         \
-			libssh2.so*            \
-			libstdc++.so*          \
-			libz.so*               \
-			pycurl.so              \
-			pyexpat.so
-		do
-			rm usr/lib/SpiderOak/$lib || die "rm $lib failed"
-		done
-
-		# Remove bundled python interpreter => dev-lang/python:2.7
-		rm usr/lib/SpiderOak/py || die "rm py failed"
-	fi
-}
-
-src_install() {
-	#install the executable script
-	exeinto /usr/bin
-	doexe usr/bin/SpiderOak
-
-	#install the prebundled libraries
-	dodir /opt
-	cp -pPR usr/lib/SpiderOak "${ED}"/opt/
-
-	#install the config files
-	rm -rf etc/apt
-	use dbus || rm -rf etc/dbus-1
-	insinto /
-	doins -r etc
-
-	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
-
-	if ! use headless ; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/spideroak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
-		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
-	fi
-	if use system-libs; then
-		einfo "You have chosen to use your system libraries rather than the precompiled libraries that"
-		einfo "SpiderOak bundles with their software.  While upstream discourages this (see bug #398313),"
-		einfo "there are advantages to using the system libraries, like reducing the size of the package"
-		einfo "on your hard drive.  For more reasons why bundled librars are not a good idea, see"
-		einfo "  https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries"
-	fi
-}

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 7a0fec1..244d060 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,22 +1,18 @@
 AUX tracker-0.12.3-strigi.patch 1166 SHA256 01078f04c1f5c37e767d0bc4ea13f8dc2d478ed95498cb350d915768f71aa8f0 SHA512 48c9ff62888e8c1bf9c4fec4b11f61f3e9ae51e4ac894c639f6479afbfc928964e35e7d37bda99c7d0e505b5c2e6a7964eb16587d5365c1acd009c51f94ef4d4 WHIRLPOOL 83db8c654f11ff9c0b9500a04c28cc499915fc0ba3517e1b572c3f7d2d38a96a625061de7a70bd3112e908ee7f2bd1f8ddc730370b42385b23a756277dda4b94
-AUX tracker-0.14.2-icu-no-LC_ALL.patch 1473 SHA256 addd3cddb5c4effb5d0620715fad791aeea5f09fbcb9ba3591f2d9a6848e80ed SHA512 6359701b2029fd87e49aa2ceabf5f1066f9726bbf5f286e34c323a0098277032182955a372dab95a2e7ec4b0b9b0bf8cfbe683550ddd679202e5343fac848069 WHIRLPOOL deb12c201992ccce05cdf43e3633f731e28d5aef9fd4cdb00908d169948b08441b9ec74e6f8ea93049b94d8b60c440b8d1596dcc0d933c4cce12ab8f481ef852
+AUX tracker-0.14.2-icu-no-LC_ALL.patch 1266 SHA256 e42770fe57d01e54811584546ee657b110ad83bbe9c9fdd1c8b017777749cc74 SHA512 7de8927c4825f09e6d419e136be5c729b2f98caa374710887b958edd17865e4fba7518596d18cb81e5ced32977593fbc4cc9bf86d0156f13386f2752ab1200b0 WHIRLPOOL 58481556fde3b3410554b8a0882e924373caf3f941fb37fe75c497d12c6edce8b97daefb671c69a37375b19d961e4c8f6fd18ba6e0bf4c59374a982ef326e0ec
 AUX tracker-0.8.0-strigi.patch 1385 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb SHA512 f61eab32f6db4b7bb44353a3d0ed10de6e06def73150d40381b8dc15145f54c474c66325641f8d82668fcca04f6a3c5771475fa98d12ba53a7084fb5eab1ca95 WHIRLPOOL ea7de30b3f87f97597b4bb9fd2601c592e319ce4562747a6b39958e3ead495a0a7486295e6ce89133fca00fb5f1a64680e45d6c57d18088f54223a355a4b65fc
 AUX tracker-0.8.17-build-with-eds232.patch 807 SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989 SHA512 fb658501e9d5dfd614ad02d5e18778a8a393fe702ed163b1044f48264b023b63b20bd4c04e3ae7dab688c31bea381b7d53b1f2420edaf12c45755adf14b0c637 WHIRLPOOL 7bc32543f2e936c018ea6384bbfa23b5d3c84615497c76df04d31e68be5cc49b427eed389273fb6196e1acae8a91e56310d89bf30d8a055dce91a113fdac7706
 AUX tracker-0.8.17-poppler-0.16.patch 1209 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c SHA512 6e3dc71154ff54cf7f5b431649433ae6ca732dc8f8022f991b371b8581f11668e8a8c02dc981a98463914065304ea26387d9113a64fb6debbca2c1692d0876c9 WHIRLPOOL a684fb49bdb82db0e359f609c884440bc3cb879c1378ead6d17671c15afdd469179e8b87653a5bf64e04389be7772f63e88d163f05c03b214f96e7427b00de8a
 AUX tracker-0.8.17-tests-fixes.patch 2499 SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048 SHA512 c830d59e724dbcfccae535a78dbfb2e9f84044d1ad9cb4b0791f0ae5b6586533b92eb06935a758bc72d45c7da9e5b855161c136c09169cfc500e4dff90efd396 WHIRLPOOL 1d81bb6df1469f648ff56cfbc0ef2f3492e2a5ad403683bb8e199787e5eaa341f084e966c36da791260ee50c4c30fcf6b8f20fed80a1069cc4e0fe70cc5e40cd
 AUX tracker-0.8.17-use-upower.patch 16884 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1 SHA512 e5e6ab059c962507eb71804ef2a191bb2522b00cf578784c454007565a546a6f67a7403bed99eba7d3bc5d312542db5faaed50221d31788fd65d7e0f2f919dea WHIRLPOOL 212c84e17a14c3ddf98a9aaced0764ff70505fdb1074249611ed5903a840cf8a2c6603061c721feb8b09cd72bb5d0a16a54ea41cfabbac252769fa66cd385715
-DIST tracker-0.10.27.tar.xz 5721444 SHA256 30ca97cc8a1c82cb0e09a921c0ebe8acbfe7be6908b2303266f447477465444f SHA512 c3760f1b0b6a1239b905f3caf4fa5196c91fabbc90eefe0682a7b060c7c6c68556c90b3004e7d1da92c72188d9844d9fa489a81524cb52c900fff3ac08855beb WHIRLPOOL 15904334e113470804dee1aa3b3780ea94e5f09a4eb1cd738c02b96bd4ad1e97c6eed909140047bbdd7f6483b2b01f3ba087a38e6ac6beb64cc901eafe174219
 DIST tracker-0.10.35.tar.xz 5754872 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3 SHA512 9645c6ff6686a94f7ce9a0e7b29b5b8d5300ba1a1706e41ab3ca97bba891855bba9ce3213435373c52fb6821dc21be0816608c0f6796cb984f090c2b35e0b59c WHIRLPOOL 9cfd6d8446c7880499948cd663017161b879b0accd3de31dd3aecf87394315af4cd28d74865dafa67674ffa07cccb7fc1fe95350a36612560f8ef5e7214415dc
 DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
-DIST tracker-0.14.1.tar.xz 6041840 SHA256 17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43 SHA512 44e166d58e38f28a742f895548a4928347cffc2936ad0784ac847c38d7bd19013401aa88124a12174d00378b9ac7d004721e57cee5f896d8f9c99a472d65b5ba WHIRLPOOL b9f3cfbc7b792f10cd0e2f7c2865bd598bd209cdc3df8b3bfd05a9d109ab60ce74d707a0770047943e46328916cf2644c2bfaa4c0d66e1aa929ca47ae0c52688
 DIST tracker-0.14.2.tar.xz 5985464 SHA256 9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1 SHA512 204749a915e6e9af7057a0de7f8b5c317a56899dd5a9ca05c029ab1a3b47c42e54b3a86eb53c31fa21ad50abebed2b3a4e99008aac6cc23cb3bc9f7faa6504ff WHIRLPOOL 431a2b06e6906269795fd05e10bac912ffcc8d1ee0e5c394e178c5c12197ed6a05ec6ba939cf21946be0a17b84717405ad8b8be3d052b3f82c4d58999308cb07
-EBUILD tracker-0.10.27.ebuild 6068 SHA256 561c6880323dc025baa485a9f2be780e5127590796114d943b0a220da0a79b65 SHA512 80294c8c998578aa095ac74975dfd2faed5b40f3c29ebf47f34b118d15c964f08fa64f06dd3baa1637325e9ea826ef52b53dece8821684812530dc513305e2cb WHIRLPOOL df10b9b635867e76515752714afea29be8eeb9d9c4c87c1c1dcef1cf3877509b886f0a4ca1efd9e95bd73b6c13c7fd611ca1ce4628b6fb4771e783b68da645b3
-EBUILD tracker-0.10.35.ebuild 6068 SHA256 8cf4701b96cac0c4444584e4aac0bfb81c0efe9c4fb4955aac1251faf6167c56 SHA512 4548f17c504bd3f72bebf260d288e01e9033b43d165b0881ce65259bd92bbbebcf17b2836ea0f04d50d632adea4f85c46d7b56020266a95653bfdbbbe0090784 WHIRLPOOL 87cb99ae2307f979b5d8ab517e7e9a74a4d68a9810ba91c5941308cd6cc2b5ed7363cf306e916eaab10a26d9fe0b85a571dc769ba6dd0a91e52d642259bda8f2
-EBUILD tracker-0.12.10-r1.ebuild 8252 SHA256 96090c632c250c11877343635d5b6b2a734ddc4715774806b2ee11728449eff5 SHA512 2e00b969044b1ca77e1eebde6d9101f5fb2c05b59321771f58d62510eb149f35c440b9477eafa82398ba76992fa713e2c43d662d9a3c3560e360cbc4c8ca3856 WHIRLPOOL 3ce2b43ce83f3d24ee451e7fd2ed31a7430b1db193fc91d6303057289b1651aa9fb8d11066b79aa064af59f1ae9835eee4ae7935ba2af3e1cda69fdfe398c05f
-EBUILD tracker-0.12.10.ebuild 8124 SHA256 8e9d37b67409ff4e5ea57f4bb95ab6b4c0a8b6c97a68ea0005f560bf0b6b740e SHA512 93708f19c2a141f161f79a0fa5d6403f759f69ef12771ae31b18b2c1adb2a4dece8f291ceee90e40ca7419e914161bf95fef0bb9e052f20bfe413369775759b7 WHIRLPOOL 3e6684babc17d144b1d8357c02c0e35b69a42a0aef9e80c695dd6c5a37b7428abd7858e2a2871a2a09e69032ce068fb19566cc23eb50409338704d3ee6283eda
-EBUILD tracker-0.14.1.ebuild 8185 SHA256 cf64b9b0ecd8eb3f2fa1abd4f7a9b879f452bf73a3afbe1075324cab8b7074e3 SHA512 060d7f987351bb150ab2960d772db4c27de971a998d02c846dae86966ae16acfb4aba31eb91d698f2c1ff56be1727ab8f0f43779c92ed58a3991932d1819aff2 WHIRLPOOL 1c6e0c62673a22861ed8a26173364b7d6176a67b34b75a93067c268b5f6a0e0cc31a86c3742599ff9549a1f53dd867796d31f3ec9157e2ba395e31bca54c31aa
-EBUILD tracker-0.14.2-r1.ebuild 8435 SHA256 03076e7f0e05aa5a26bcbad08be2d16ce37a9e97f7d9f08b43e5e597ea3f8dd1 SHA512 1a98e35af2aa87887e5f5bfe3ac02eb37b267e15e36c020cbf038903c5181dcae4ce5b5797b1bbc4ed1852965c1a8e98b152ce505cdca601b9980438f8975e77 WHIRLPOOL 23efec2c31b4d1ba8642736ef515c5cd76e2dfdef0ec162b55c4d95db426c679f9c30f8681a121d30530acaf0f11cda731bcc8bfe0423b4675b3db229f03abdb
-EBUILD tracker-0.14.2.ebuild 8185 SHA256 8425b29496b9fb9826e4745e71459e8654e0d8cbedbe39a817cfc1bd2ef2e669 SHA512 5fc1a6e8a36b93c61ceb1200ca6ab2f52ebff27838e83182b558c5d0586f9ef2c0395081abb57cbfb8d437e2eca0df6778479ce3eb3519718c2dd65506bc45f8 WHIRLPOOL c52022610d7982da06e4031384aecca94ddc8e9b0d27f99e606b62e89c0d2f8e5f852b146ed7eb180c690d5c710d4a7bb5d730e544d0805d866e55d265d686fb
-EBUILD tracker-9999.ebuild 8149 SHA256 53f44ada88f79aa699101bbcff913c76b76cb87387eb26e39f917320fe7c0243 SHA512 59c7852a29cfd34bed077d003ae142028056433e5576724ea911943efbf6a45edd0aabb671387cad32816bcb61e56c138c6ae87e765df05becd531e407095e3b WHIRLPOOL 8c5af2244e25196176b3d2b57ab517510dd97c6859cc40679e67d7df1cfdbcd5c277fee87aa8125a9a20e6bcaa760e035b68489ca032ad0112831a54d6549d28
-MISC ChangeLog 24545 SHA256 76681d78708464d9ec0307b1007e38d1fd3635ea41c9e5bd27b9c196bfbf820f SHA512 9c836138519f0f73630929dabc9b982884482887edd616a75ab7d86b3326b66c7819c2ba5305a4ab8dca48c2e01b5adf413fb6ac94fcb75d1c19dbe86eb5a93f WHIRLPOOL aeef6b85f55c2994088ea7ed917d9d8d34989fe7200d9f40723f6c98d299e95a58f83ef701f86a71e22deabfe5ecc3274e91ef75bd08ee7a323b82e92384c86b
+EBUILD tracker-0.10.35.ebuild 6148 SHA256 9e2988b14246d27fda9f9e5a75fda42bbc0cdfee20712e972d777e2f8d29a033 SHA512 2cb8a77c9377cafc32b40ce1c95b95a60dfe92b69ab905234d205888575c0be40b4dfcf4c36ce37debf2618b4a294d40ede4487f0491d27148ee7964fbba5e77 WHIRLPOOL c59dc43ff738ab94e79110b388cbfa740cdba0ccef4994ebce39ce855d8484de8eb7844eda449fbc3da3573d8c3622900acf5787b3173f8ff4239e91a82cbac5
+EBUILD tracker-0.12.10-r1.ebuild 8337 SHA256 0285cad106236aa4306eb23f3e0b2c9ce389cba858b3a737edb383a0180b47e7 SHA512 a55086559b2544246f78ba10d72d63481956324ec287538179d7bb1f872aa96d8f3b9d6cd6b39f06bd584a76071a09c39bee2db2051576a76dcd62aad3717c80 WHIRLPOOL 3939bb96dfc92eba9cd9e5b4923cf55f04aca5e96c0e0c33c85f48628c026e7dafb733928119eccebcaed8fa7056057c548295c89c1adf85b4e4b97ef50abcef
+EBUILD tracker-0.12.10.ebuild 8212 SHA256 bdf7f14cabcdfbdd14e6e6edcb895853d190649fbe22c1d57bce25422c3c6bfd SHA512 7ce937f8f79cb8bfe50c7d6f418bec625ecbc4242112cbc153e0ef5a255c7f987018302d9cf9e3c6cc37456611f448f71e32be3bbd418dce255bb288322b4c33 WHIRLPOOL 176d25ebdfd20aa81325312be0ccd2215351afe77ceff56f1e7bd5fac7d254854937bf690e4237f4f0558e5a0e6dc7e1acee21389438f755f50a1b7803bf29a1
+EBUILD tracker-0.14.2-r1.ebuild 8656 SHA256 f0791ec19de48ba187842555e3cb7dc474ccc301fc1ab927a21452b233e5001a SHA512 963bc0bd43842afb5ada2eac809984d389e998497a2f0487cde737b098b37d3264b79daddf0eda65cabfa311d3fa699036e5ac462827266ad32629507f8181be WHIRLPOOL 0f4548f4e7b2945353c15e54fc84d045eefa8649e76ddc8e8eddbeb08de8ee1787089d2a5e2fc4529bd7ee810c8d726e3c71e40007dd8aad405a8815d5ef72d2
+EBUILD tracker-0.14.2.ebuild 8270 SHA256 9713a86dcddd1144fd917d7214a12f3d62f61ff3c4ae7bd86f8d4bb4865eacd2 SHA512 1f043f1a9ecf408d0c2e8dc56b89f803e25ca111680f8fa49933c2458c9cd1613a121bb270058d551ed0af9a65b7d2d78c5e4584293dd842b26769d96c3377f6 WHIRLPOOL 0ea2131a836838140121b8e98a05069f191ccd722c8da14e7c08cd7e427f99f384202681f12e52dabf7e5d6fe17490da1fea0e95eca09bd574e1b262b0f6cee8
+EBUILD tracker-9999.ebuild 8246 SHA256 9200099d4fec1c0177cad64665e97cb5118cc5e46ddfa9f6d24d39577c5e92a5 SHA512 f95e08c8c195eda7e98f7053b1c193fb08b6fe14df95106835722958cb67326e273d864d19ceaa4c72ba061880b98438e9407b004b1f9185ccc36ec9bec16f0a WHIRLPOOL 92e92017334ed4bc61c76f27d9f71f7fab8982dca28fb4f128d8a6c57b90774fd36c5e6d53dfd6af65106cbacde3a411eda0620e988a0cf74653789c0ea21a58
+MISC ChangeLog 25148 SHA256 5fff00b0c0626d3f0dca07f8ba408b61680ab9315e449d9af46f6ca216a9c680 SHA512 237aee8df7e80200d7379eee556ef290c1927b7d9daaa3fa2636ad1e8a82e2486fe670f57ca43000d9c866837acbc740a1bf7d0b58b161bdccea388216561ec6 WHIRLPOOL 0ac676dd059f48b3dbc7158ce4772540f01671bbcf7b28d7c94c4eba23d20e250a56c40496462c4bc878bfcc55e90d67a5810ff59ec8db5d0705fa565994f789
 MISC metadata.xml 1621 SHA256 a01929993109e8e5b6c5e3ba8433a99ba4417f41328455823907a860dcb4311e SHA512 26808b5c3decabbbc166a67ee7d3b5f2ea68899684f79a092a74f8b712be1806560db3659671df3ba7ccc490a57bfae728b6e7ac9cfb92765d35bdbb7028b439 WHIRLPOOL bb4df83f2e873334dcf1ce20cce359738291ee102b759863bd770b63fd3ca8cce653700e9a84ec83f18672939a12ba9089d01637fc32edd3799b6f962651dd4c

diff --git a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
index 7ecac00..b0615fb 100644
--- a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
+++ b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
@@ -1,23 +1,20 @@
-From c0f298d3db5202d1e6de7e093923f396116eefc6 Mon Sep 17 00:00:00 2001
+From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@g.o>
 Date: Fri, 20 Jul 2012 10:46:33 -0400
-Subject: [PATCH] FTS parser: ICU cannot handle locale descriptions of > 157
- characters
+Subject: [PATCH] libtracker-fts: ICU cannot handle complex locale
+ descriptions
 
-ICU's unicode/uloc.h #defines ULOC_FULLNAME_CAPACITY as 157. If a locale
-description cannot fit in a buffer of size ULOC_FULLNAME_CAPACITY,
-ubrk_open(UBRK_WORD, locale, ...) will fail when attempring to
-canonicalize the locale string.
+ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
+not the full definition of your various locale variables and their
+values as returned by glibc's setlocale(LC_ALL, NULL).
 
-To avoid this, we must not pass setlocale(LC_ALL, NULL) to ICU since that
-can easily be >200 chars for common locales. Instead, limit ourselves to
-LC_CTYPE, since after all, that's all we need to determine word
-boundaries.
+Instead, limit ourselves to LC_CTYPE, since after all, that's all we
+need to determine word boundaries.
 
-https://bugzilla.gnome.org/show_bug.cgi?id=675660
+Fixes GB#675660.
 ---
- src/libtracker-fts/tracker-parser-libicu.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/libtracker-fts/tracker-parser-libicu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
 index 7388f69..69f75ed 100644
@@ -33,5 +30,5 @@ index 7388f69..69f75ed 100644
  		                       parser->utxt_size,
  		                       &error);
 -- 
-1.7.8.6
+1.7.12
 

diff --git a/app-misc/tracker/tracker-0.10.27.ebuild b/app-misc/tracker/tracker-0.10.27.ebuild
deleted file mode 100644
index f580b35..0000000
--- a/app-misc/tracker/tracker-0.10.27.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.27.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info python virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac flickr gif gnome-keyring gsf gstreamer gtk +introspection iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91
-		>=x11-libs/gtk+-3:3 )
-	eds? (
-		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-2.18:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 )
-		qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-	nautilus? (
-		>=gnome-base/nautilus-2
-		<gnome-base/nautilus-2.90
-		>=x11-libs/gtk+-2.18:2 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	strigi? ( >=app-misc/strigi-0.7 )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.12:0.12 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.12:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	inotify_enabled
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	if use mp3 && (use gtk || use qt4); then
-		G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		$(use_enable applet tracker-search-bar)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable introspection)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable nautilus nautilus-extension)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs 2 "${S}"/tests/tracker-writeback/*.py
-	python_convert_shebangs 2 "${S}"/tests/functional-tests/*.py
-	python_convert_shebangs 2 "${S}"/utils/data-generators/cc/{*.py,generate}
-	python_convert_shebangs 2 "${S}"/utils/gtk-sparql/*.py
-	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
-}

diff --git a/app-misc/tracker/tracker-0.10.35.ebuild b/app-misc/tracker/tracker-0.10.35.ebuild
index d3e8f0c..aef1e5b 100644
--- a/app-misc/tracker/tracker-0.10.35.ebuild
+++ b/app-misc/tracker/tracker-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ inherit eutils gnome2 linux-info python virtualx
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -42,7 +42,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3:3 )
 	eds? (
 		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
+		>=gnome-extra/evolution-data-server-2.32
+		<mail-client/evolution-3
+		<gnome-extra/evolution-data-server-3 )
 	exif? ( >=media-libs/libexif-0.6 )
 	flac? ( >=media-libs/flac-1.2.1 )
 	flickr? ( net-libs/rest:0.7 )

diff --git a/app-misc/tracker/tracker-0.12.10-r1.ebuild b/app-misc/tracker/tracker-0.12.10-r1.ebuild
index bcea0a9..367fbd1 100644
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (

diff --git a/app-misc/tracker/tracker-0.12.10.ebuild b/app-misc/tracker/tracker-0.12.10.ebuild
index 3707567..c3da258 100644
--- a/app-misc/tracker/tracker-0.12.10.ebuild
+++ b/app-misc/tracker/tracker-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (

diff --git a/app-misc/tracker/tracker-0.14.1.ebuild b/app-misc/tracker/tracker-0.14.1.ebuild
deleted file mode 100644
index 22de9c1..0000000
--- a/app-misc/tracker/tracker-0.14.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.1.ebuild,v 1.1 2012/05/07 07:42:32 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info multilib python versionator
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-REQUIRED_USE="cue? ( gstreamer )"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:=
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91.6
-		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.0.2 )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-#	strigi? ( >=dev-lang/vala-0.13.4:0.14 )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	inotify_enabled
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
-	# is not being generated
-	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(use_enable cue libcue)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable firefox-bookmarks miner-firefox)
-		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
-		FIREFOX=${S}/firefox-version.sh
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable iso libosinfo)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable thunderbird miner-thunderbird)
-		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
-		THUNDERBIRD=${S}/thunderbird-version.sh
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@×××××××.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@×××××××.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}

diff --git a/app-misc/tracker/tracker-0.14.2-r1.ebuild b/app-misc/tracker/tracker-0.14.2-r1.ebuild
index 40298cd..87c9007 100644
--- a/app-misc/tracker/tracker-0.14.2-r1.ebuild
+++ b/app-misc/tracker/tracker-0.14.2-r1.ebuild
@@ -1,34 +1,40 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.2 2012/09/08 02:07:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.3 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit eutils gnome2 linux-info multilib python versionator
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit eutils gnome2 linux-info multilib python vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
+EGIT_REPO_URI="git://git.gnome.org/${PN}
+	http://git.gnome.org/browse/${PN}"
+[[ ${PV} = 9999 ]] && SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-VALA_DEP="|| (
-	dev-lang/vala:0.18
-	>=dev-lang/vala-0.13.4:0.14 )"
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7[threadsafe]
@@ -45,11 +51,13 @@ RDEPEND="
 	applet? (
 		>=gnome-base/gnome-panel-2.91.6
 		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
@@ -67,7 +75,7 @@ RDEPEND="
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.0.2 )
 	jpeg? ( virtual/jpeg:0 )
@@ -96,10 +104,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	applet? ( ${VALA_DEP} )
-	gtk? (
-		${VALA_DEP}
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
 		app-office/dia
 		>=dev-util/gtk-doc-1.8
@@ -108,8 +113,12 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( ${VALA_DEP} )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -142,15 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		if has_version "dev-lang/vala:0.18"; then
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)"
-		else
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-		fi
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -213,6 +213,14 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
+}
+
 src_prepare() {
 	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
 	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
@@ -231,6 +239,10 @@ src_prepare() {
 		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
 		-i tests/libtracker-miner/tracker-password-provider-test.c || die
 
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 

diff --git a/app-misc/tracker/tracker-0.14.2.ebuild b/app-misc/tracker/tracker-0.14.2.ebuild
index cc6d637..db8aff4 100644
--- a/app-misc/tracker/tracker-0.14.2.ebuild
+++ b/app-misc/tracker/tracker-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.1 2012/07/05 23:35:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -46,7 +46,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (

diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index c03b916..9e36607 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,32 +1,38 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.51 2012/05/07 07:42:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.52 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit gnome2 linux-info multilib python vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 EGIT_REPO_URI="git://git.gnome.org/${PN}
 	http://git.gnome.org/browse/${PN}"
-SRC_URI=""
+[[ ${PV} = 9999 ]] && SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS=""
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # nautilus qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
@@ -49,7 +55,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
+		>=gnome-extra/evolution-data-server-3.3.5
+		<mail-client/evolution-3.5.3
+		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
 	firefox-bookmarks? ( || (
@@ -96,21 +104,21 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/gtk-doc-1.8
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
+		app-office/dia
+		>=dev-util/gtk-doc-1.8
 		media-gfx/graphviz )
 	test? (
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( >=dev-lang/vala-0.12:0.12 )
-#PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -143,11 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -207,10 +210,15 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_unpack() {
-	git_src_unpack
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
 }
 
 src_prepare() {
@@ -223,10 +231,10 @@ src_prepare() {
 	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
 	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
 
-	gtkdocize || die "gtkdocize failed"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 32f0420..c61499c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -24,9 +24,9 @@ DIST libreoffice-core-3.5.6.2.tar.xz 102714756 SHA256 0c0624aca649ab9d86aa3e3558
 DIST libreoffice-core-3.6.2.2.tar.xz 109090048 SHA256 5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37 SHA512 84784ec5c1a7c0ba1a617ebdede8153240cb88c4a83aa45f532132c076e36434ce00bac162ca31578df7ae97f09fe59cb571cdcf941863ca95d776f5c3e45843 WHIRLPOOL 29bc7c54756c6bf9abb47d73452e2fd5633bf4360e0a075aee29b1749f127fe23f9647165d6d474e95628e3fdc1c6a4a165a55595d7cd925a8d7007ce3d3cf78
 DIST libreoffice-help-3.5.6.2.tar.xz 1856988 SHA256 05840501d0ad959de0ea907c067f8e6c4c91397cba49b54c8ea8a0f0d01fba22 SHA512 1fa1a202f6e975dc6baedec7cbbe6f98ee365bc87ac052eec1559db91984eee552a44b5ed09cf6d574fa002d95189ac7ea30556e829f994fd195d62447a1e35e WHIRLPOOL 516c7848fd077b4962cc703ebf314676424255aa921babefd43c4e710ed2fe33d2a8e6330e491623015d6ae26bfb0d84c9a8cec62eead4f8a42839223969dd86
 DIST libreoffice-help-3.6.2.2.tar.xz 1911136 SHA256 55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31 SHA512 1865c70416e51dd76b326d538f618743d6dc6482a768fc31fdb09e52cc332c1b8192f063ef955ca026d8ebc0cd71a6158924f35dac5f9d66e947ad3d71a39bce WHIRLPOOL a8bdd25827d0c896618da2e78340299c948d6628133f5d0ad428ba002c4a194e05b4d2391d33bc7ac672231c7c427139f216df726378691def483aca10bdf209
-EBUILD libreoffice-3.5.6.2.ebuild 15680 SHA256 93bd1a53fccece6729ddec5af81793ffb5dce931d1e7b0add7ba8b3e63554f12 SHA512 d0e2e8fbdf02ce5f33eef01559c7b909abdddb52948abde534debadd20d920138d19c32fe7d1f2528b0ec57cd9def3248c07716e8dfe40e682f685dbed29d03c WHIRLPOOL 027912fee88fcf6cb45c071ea1109c2d3d551d35dcd8a6f3b00958f73e4cd03148a50ae9c1663e5e9f5788a8949b62ba0be75c93b94313b34003108b74e70910
-EBUILD libreoffice-3.6.2.2.ebuild 17397 SHA256 74f98b4a2a2319c68a229740e92841a7d7db61ca6d3dd9a2abc05cfb4fa4498d SHA512 e876ce82851e385af9955be302d879b9aac734d5ab93a6c7fb54d91be4f251767d571e9775b27ea58dacccafebb3f20914fa1ed7551100f9dc062c3f511e3779 WHIRLPOOL 447dc6e7ffcb63602875c4f38c2cfa1279591ad161d7a4ad7afd671e69a30d56f6ac1a03809763367264c12e5bd61bd430a0b210c7bde0d92b15a7f0c581cc19
-EBUILD libreoffice-3.6.9999.ebuild 17407 SHA256 bdc14bf9ddf960f9c62d9b033f8de3269d3bbd0aeb83c24f07c1973f365e586a SHA512 40bc1b9e8886ff907139709b0da90b94ed4b7e88da9b877f7bf491d32ad4bf9f9ccd981fb99e0a50056c626fe702916e042e207ae5bc546ebf9286026ed7120a WHIRLPOOL 0d0176750dd04aed01579e1fc120b31a6bf90a89fea4d48a83ef61168184ade1208b9249c8ed1a4dfb4ceaba5a60e170b9c1bd45eb752792b93852b755385381
-EBUILD libreoffice-9999-r2.ebuild 17627 SHA256 0c97729450b4e31979d12c276137db1afe25693e5a2a9a6cf4c274f59b734d27 SHA512 1e1214c1c6ded3321cb2a57cd0bcbd5213a4d3ef4af5fec9e210053ddc8db64ae039bbfa7199841f1b7058f84c0a44af181eddb03bf786e9557c062f177b08ce WHIRLPOOL d011041de225f269df3d3c5135364af3a296462f68fcbc88159972f0cc6ad173d122026eb6ae68aa5a744047cdcdd83f54028204e0ddb01b19b521221517cf34
-MISC ChangeLog 69186 SHA256 0414d3ed9148651f0b0b30847df0d01a969a4b771da766aab03dda58a6d7a82a SHA512 67c382334229f218a8559befed5b95beda85d6a35c0341e20b78b19e463b9943cdd9bd1ea4bed9d88b5064621ccbbd4e00f24bc834ca3181366cb261de159c4e WHIRLPOOL bc7c2233df762e385516b3c38de9c0637aef1663654a27cdf1895e58ff5c7c20bff70216ffbfa5b0d3e5ed5123f7d6d71251c966ee85acbee0845f4d0c32b558
+EBUILD libreoffice-3.5.6.2.ebuild 15676 SHA256 59814884798faea8e99062b6c943dc59f0ee8511493e9516829067fd5abde9dc SHA512 52cc54fdf998f320065f4096ee89dcae9c1079900b03f4f44399ed9cc4682edfd76c9cc918a538f460ce6a4d11f7fdd8bb6685c1ce99dd2074a46e06c9aaf965 WHIRLPOOL b6b8f2412c5d74e396e3a95a3394d670b559e7b08ffefd9c5539a0d77ae612bdbcb09d78285257eebd3910cb70f362a32f6ec6e2793acb96c7f75ede0f7277a5
+EBUILD libreoffice-3.6.2.2.ebuild 17401 SHA256 53dedfa99ab8f843ab95835ced42e83aeac72226dd647122bfacc19e7ed03698 SHA512 6c254488bea9300c11ad7b12aa8d928ea3fd13fa91a7e149efa5c306ba62693584977f90788c6ca91132e35235086764231b472b80a258208ad1989263bfee49 WHIRLPOOL 305d18415b2676581b93c70c87d63b06d2db45fc8198353b0ab3b485be1d64309dadc6f5b68372887f51fb5e6d26f5a502e2f30a47e3eaa7f9bb0c482027ded7
+EBUILD libreoffice-3.6.9999.ebuild 17403 SHA256 be919339a15ab32ffbb8ea5d7343b1dffd120f1214f26175b612291ab083f65a SHA512 8efce9be8c019dee8dc67ba392929e4951cd54eb64d60420e235251ab0b5c61d3c1cdd5662958ede3e11a5f9708c89ee3f7d2cebf48392a6d2672cc57756b29b WHIRLPOOL 4a4dd7759edf8a7a8b697494201a67dd7ca1c55871d2cf73c2219d73dce8dc96a39cd6cd21d7ffed6c61514e68cecea491ee1bfc057dddbc3fbc72f286b6026f
+EBUILD libreoffice-9999-r2.ebuild 17646 SHA256 e62497514a87776ffef9afa49521c9713442d304e49c6e2707cf854e86d82fd3 SHA512 b76e7b88accbe772ce56f9f52873adc1ca3ee8ee310b4ad37b874e51553dcdce808f605b7fe1a46d091c50a11cf1a358de03da72aaf56297013e1d48eaffcc2b WHIRLPOOL a92c48d1eac41ccf18c74033619459a34e2d5d0f2525c0dde8beb47c0a59cb374169f36f7bd61fe45a8681f152866da8fdee65c30e224750435bccc97231f200
+MISC ChangeLog 69295 SHA256 c77b1cd57368a4b6d6276b640e67ca1a6d38bffdf4ff69e78a36356636e05b71 SHA512 9cb8f10f38cefe0f76fd42ad76f4794981bc94eee49aa42ffe5d1bdf3cabca3d9044198aae30314c72fc2af56ceda7ee148e39a8f67bb81377e04a616271ed0e WHIRLPOOL 5b2e83e0f6d90841214e6d087e477dfcbf607bceb326b63b29479bfb9dee1349e7ae6b7f07f129d7a45f7782746ef956403f016463f164a1bfae738787d9edc2
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172

diff --git a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild b/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
index a346d3d..49b3910 100644
--- a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
@@ -368,7 +368,7 @@ src_configure() {
 	fi
 
 	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng:=: use libpng splashscreen that is faster
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
@@ -401,7 +401,7 @@ src_configure() {
 		--enable-randr \
 		--enable-randr-link \
 		--enable-release-build \
-		--enable-unix-qstart-libpng:= \
+		--enable-unix-qstart-libpng \
 		--enable-mergelibs \
 		--disable-ccache \
 		--disable-crashdump \

diff --git a/app-office/libreoffice/libreoffice-3.6.2.2.ebuild b/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
index 1332400..cbb491f 100644
--- a/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.2.2.ebuild,v 1.1 2012/09/25 14:03:14 scarabeus Exp $
 
-EAPI=4
+EAPI="5"
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.7.4"
@@ -117,7 +117,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
 	media-libs/lcms:2
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:=
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4

diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 2d5566f..419820e 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -409,7 +409,7 @@ src_configure() {
 	fi
 
 	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng:=: use libpng splashscreen that is faster
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
@@ -444,7 +444,7 @@ src_configure() {
 		--enable-randr \
 		--enable-randr-link \
 		--enable-release-build \
-		--enable-unix-qstart-libpng:= \
+		--enable-unix-qstart-libpng \
 		--enable-xmlsec \
 		--disable-ccache \
 		--disable-crashdump \

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 1dc363b..51e581e 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.115 2012/09/25 09:53:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.116 2012/09/28 09:34:51 scarabeus Exp $
 
 EAPI="5"
 
@@ -414,7 +414,7 @@ src_configure() {
 	fi
 
 	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng:=: use libpng splashscreen that is faster
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-graphite: disabling causes build breakages
 	# --enable-*-link: link to the library rather than just dlopen on runtime
@@ -452,7 +452,7 @@ src_configure() {
 		--enable-randr \
 		--enable-randr-link \
 		--enable-release-build \
-		--enable-unix-qstart-libpng:= \
+		--enable-unix-qstart-libpng \
 		--disable-ccache \
 		--disable-crashdump \
 		--disable-dependency-tracking \
@@ -480,6 +480,7 @@ src_configure() {
 		--with-lang="" \
 		--with-max-jobs=${jbs} \
 		--with-num-cpus=${jbs} \
+		--with-system-ucpp \
 		--with-unix-wrapper=libreoffice \
 		--with-vendor="Gentoo Foundation" \
 		--with-x \

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 6c52065..a730232 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -21,7 +21,7 @@ DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da711
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
-EBUILD icedtea-6.1.11.4.ebuild 10658 SHA256 427b41a560754d0b04bf7ab0bcfcf087d9c0d441b8ee47cd5dfbf56f6ee54266 SHA512 6487869f5c80b44d6882e0b7e07e4550caa29d12872e471fb111489f21193bb87a05b1ea3a43d6d22610ee52b7df6f55761dc1340ee8dc4de81ac764b969a977 WHIRLPOOL 12b06251a92b5748a09369722c9c5b594893b62313a558cf14ea9e8b91e8e17bbd40ba5f39d35ba56c1df1b8eca2f85812d19a78e31c6d1f8c9c78bcd2da5123
-EBUILD icedtea-7.2.3.2.ebuild 10874 SHA256 019296d5c11411f45f944f48e439d1ab3c95b0e16e426f13c062e301563a58ab SHA512 c971d82120377f5e7e4d0255071183b74dec8ff96dc97eac4a90b50e729f4e5153c08f318ebed3a6571d779234b84e26e5c5cda5595e353d531b2b95cc8f9c19 WHIRLPOOL 78a395ce7b8e5e04db5f87f3d2ad85665487d1859812213903dee06020e93e0bae4ab1cf6aaf2373eef8ebd457957337be06d3f835f84d3b59cb509c8311475b
-MISC ChangeLog 18989 SHA256 5efc673212929da94f13c486c8e7ba6eac28622d6d06f91b6201de2f85c44d2e SHA512 4c1cb15c966c9bd335f9c588d3292b3cc8223a84136ea8b93d3c68376694420ce1aac57a3aeae6136465c6a2a0ca094ba22589cc6c9c7df57e4dd0053713a6de WHIRLPOOL 27161615d002201c23d8202f68d41b0d55ef86feee71590287dd4f5979af827ce8a439193e71ebdf8be4f8302155a1b3e420f796675e7d964f24186bd19fea65
+EBUILD icedtea-6.1.11.4.ebuild 10615 SHA256 ea2297cd22e7a4feee3f2cf5bbcc5853c1a18ea7dabb8c432519f7bb987bf247 SHA512 3e09f27962d38a482a5e6c4305f0604e41398113383ff59b1534d0b9fb26e7332afd3b7cfa1f0f736ca1685d2a202db062c2a7256bbb16f0ffcab9f331b30ded WHIRLPOOL e0b9662ae4008d269ecf2a36ec0f416daa8400bcf34ca9b8d5f11700c510ea81caf842d08622212405c94eed5ad9415ec2c8df7fbc5e062a36b2d320cb57f79b
+EBUILD icedtea-7.2.3.2.ebuild 10831 SHA256 b267955d9aaec268b347d40f70666f0178c6b85ab7cd31f92824688f12cb8afd SHA512 cd2cd62f08270b9ed568345ee892bc3c072e026441c0c3aa3d43c807a3f9fffb43db6376a0dc3136cca499d9750feecca34af976f6a0ec2e1eaa96ab84ebbbf5 WHIRLPOOL 889ee254932b2bdd766bb47ee83d5c19defd7ba0e98d1ec81f1cf0499907162f59fa15f6a2579034f95a037ebc205bfe0572a893ff0a4bc0b775b18a08e9762b
+MISC ChangeLog 19140 SHA256 e0ebab8522088d2cb4be0c95654d862fe16d537e4cedb7bcfa06f37b2a8ea3cb SHA512 f8b58daefded07eb01f71b732abe16183d68cf5f8bc3356e201b23f5cab79da35e05368df0321261703dc12f0856b6939da5d9f4c37af31250d91ca855566b7a WHIRLPOOL 61daed0f82bce97e5d6f5fac96f049c9427d9890c18ef698066bc59abf3d90a68d7a94c1714e20ea70fecf84e5d4d0ac7079132685ca63ac5ea8c88b9d19088f
 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a

diff --git a/dev-java/icedtea/icedtea-6.1.11.4.ebuild b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
index ad0c64e..c7f941c 100644
--- a/dev-java/icedtea/icedtea-6.1.11.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.3 2012/09/28 10:41:09 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
 
 # *********************************************************
@@ -261,7 +261,6 @@ src_install() {
 
 	dodoc README NEWS AUTHORS THANKYOU
 	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
 
 	cd openjdk.build/j2sdk-image || die
 

diff --git a/dev-java/icedtea/icedtea-7.2.3.2.ebuild b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
index ad93f27..8363972 100644
--- a/dev-java/icedtea/icedtea-7.2.3.2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.3 2012/09/28 10:41:09 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
 
 # *********************************************************
@@ -257,7 +257,6 @@ src_install() {
 
 	dodoc README NEWS AUTHORS
 	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
 
 	cd openjdk.build/j2sdk-image || die
 

diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild
index d91d0af..600e336 100644
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild
+++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild,v 1.1 2012/09/24 18:09:38 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 WX_GTK_VER="2.8"
 MODULE_AUTHOR=MDOOTSON
@@ -15,11 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="test"
 
-RDEPEND="
-	|| (
-		x11-libs/wxGTK:2.9[X,tiff]
-		>=x11-libs/wxGTK-2.8.11.0:2.8[X,tiff]
-	)
+RDEPEND=">=x11-libs/wxGTK-2.8.11.0:=[X,tiff]
 	>=virtual/perl-Module-Pluggable-3.1-r1
 "
 DEPEND="${RDEPEND}

diff --git a/dev-perl/Alien-wxWidgets/Manifest b/dev-perl/Alien-wxWidgets/Manifest
index 9bdd210..042bac8 100644
--- a/dev-perl/Alien-wxWidgets/Manifest
+++ b/dev-perl/Alien-wxWidgets/Manifest
@@ -3,6 +3,6 @@ DIST Alien-wxWidgets-0.60.tar.gz 666207 SHA256 282b283dbe989365cdb5c13dceaf62769
 DIST Alien-wxWidgets-0.61.tar.gz 666365 SHA256 d8cb146f3c100a4dd904fbe1259ba1fc8eee25a2c25926cc4460d40c273495c3 SHA512 5d83211ef9f13836e162bd1492af2928f3b4a9c2044b7432efe086ce99c8989c3038e126bd75adf19307f9ef4fd1382e5a0332b14f4d82155def3b17da68c75f WHIRLPOOL 0c5e1d3d850de9a164c3540c086a13e10427132d5ab2e17f57e7b3ce5fde34a7cb70c2fc56044bf7e55c573a3d27f3ecb82c9172de056f6f2112eec5c2a19587
 EBUILD Alien-wxWidgets-0.590.0.ebuild 738 SHA256 c71bd0221420aec7e5fda2ccb80d7bfff5fa31dc25dbee9f01816b3c68990af1 SHA512 7ccd6c61a442be945a7adbaffc6d18a325b17fb8ae3558d33d8a08e00c09d070661299f2f2da3435ef901698440c78d0a778cf5d8afd641ff1780f000ca3befb WHIRLPOOL ad011750fe1c80d0d6efa910d1a5b76988cad9b0db4f7174459e77b0fd2110fc6dfe608326a7cf3edb03f9ca383c2b760bc66d0d6b54a7a169f2f99f9fc9ecd6
 EBUILD Alien-wxWidgets-0.600.0.ebuild 743 SHA256 030a6443c94d090c2592bbdae6f708a06fcd76d7e00985b8d0e7b4508e1828e9 SHA512 bb162ee9209db0b73f3808b26f26e19121059eb9e36873ac64ec2708a2f59b0a25c552802e55123a5e2618211260045404cdeb1572bd82f3d51fe7e869b98bd0 WHIRLPOOL 55606b8a8cd612a24b513b809254342b2c4120d33e0f97ab75dee263cfd3cf039ee215a03cba16608a1c555ebb17d221a0e0a629a234c6a9d124981007a4b2f6
-EBUILD Alien-wxWidgets-0.610.0.ebuild 821 SHA256 b8fa75e23eca6b93506da3bb8a1fd0fb00c8b5331fd4644f3fd9d78299e7b640 SHA512 8f37abbe7b2d304ffde790a656c432a18a3c979045438e9309a19a45ec87c347fb35412c008bd2d5e3232d12159353ebd701e4d4ba668d5fb0b1923bf76d5a88 WHIRLPOOL 5d21429a330529a3f52f70529972259fd399b26de3eeccb300ae7c283e5af5bca949991dfb757f92ceae1dfcbf14fa3d6b46663549b0da8b7f28ec79ed9bb0ca
+EBUILD Alien-wxWidgets-0.610.0.ebuild 780 SHA256 030e985a00491e80392c5e1f24a3620f0b7fc0641d231a868bc8dd6e4f4f199b SHA512 3744badd735bb121ccd0e978d8604b40ab8e2809dd8b2d61f738fcb100279af494af5e61866506ca29d14f8f82c3b0fd09920203fd0bdabc825b0929346072de WHIRLPOOL 781e88408457bb500f421dc1c8aa4f98b4bbf65d52245aee855c72413a887da21bb956e787e822c6223dfd8417865599d78c1f8c3f8f87fefeb4fcefa8535c0a
 MISC ChangeLog 6675 SHA256 a232782ab7d723159f3406b99f76e26844749a3c858bf4cab76f6e0cb5f9f3a2 SHA512 59926b36f90e0c12eaf55740807479fdd67b53e6a40fa2570bb08a0e2a0840c59bf1333942dd1f6fd9c7fa959c7deeda610f631d0e6fcc9c1b489c8159002968 WHIRLPOOL 270ba9134308e4923c1a30a47ead9109513052afc95ff7cb9dc1c7719afbaccaa9e325d1ee412a7c9ef48cf935219dc6da30bee5953e556840149d82a3f4854c
 MISC metadata.xml 376 SHA256 7ff696a38937cfbe4e96b68e64ff9e35a7f9078c77a574b023b22d3dc1bdaffe SHA512 cbcb56be6b1ecd6398c4cdb68020125492ee45107c0f8670f906c479bf09122f319e5d742521d5a356f111a131fc13af0eb71b8b19bad531075dec7a8f9249f1 WHIRLPOOL 64251e95a543b363472be10d11c391ce359510faf795f688d810218257c0db9dd99d5b62fd51e1a09cb7bd12c6b8e7e578438161ea8a8d1b945af64d48978478

diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild
index 7b879f6..fba9a07 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild,v 1.1 2012/09/24 17:53:43 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 MODULE_AUTHOR=DROLSKY
 MODULE_VERSION=1.50

diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index c62bdd5..ece30e8 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -7,6 +7,6 @@ EBUILD DateTime-TimeZone-1.22.ebuild 783 SHA256 e421ae7d4c5d21fe51c66b476482c107
 EBUILD DateTime-TimeZone-1.460.0.ebuild 765 SHA256 209f588cb9b89d76aecb372129be88f504210c6d8b4478db43c18b9b8dc694dc SHA512 79bb2267ec41891876801829626d247b867287fb6a022eff6030ed3723cebfc8ed2b9853a62c7ef933322bcf6fc6629d608d7d567ff75076dfc08097ba3b1ffb WHIRLPOOL cb4d5cac1fb2c3da258d21afb3c068cc570db85e7753d41544374f0ba7e4b4b2d73f863aef95bc99c5a8c18dee34fc2962de5f4280475ddb7c702fa81f79c8e4
 EBUILD DateTime-TimeZone-1.480.0.ebuild 785 SHA256 315d27349bb817cae91a57633462fcc81b7cb8d91aaa8fc92e8705c6c5fce145 SHA512 371716cc6210d0648a14201bb29de7ecbfb78e2071dc36eba1be6ed5d5c5f948250c69b6a4f02c8f1d5ea6a208e5fa72cfa24b323963461c48b8a18020e6a1b2 WHIRLPOOL 2bffb7a02ea60654d7c55b2f16b0ba3152ff93119abbf119699beb8be02a4c6259ad57cb14e1bede7447361bea4b3dc89cc684c4806b69e59f1c054c6a58ba93
 EBUILD DateTime-TimeZone-1.490.0.ebuild 782 SHA256 78e5bfff8e978001df27709db94a2c2340d137afd8fc34c4e935e133cf41c83b SHA512 2a66c3fb8a4d9911da4efc22f8b41458e586e6f456a1c3b52caa3ac052b1d269954621b6ab86843b0668f2a7c3e354721549df4628460397ce5b6b7850eb7f3e WHIRLPOOL 4318ab32e317c163d0cb88d8c0f9e2ec60975025746849a4bd93aa59a317d977f8a67b81f84520320243a0bf240dc21ceb5e4955d6a28e174fc77406fb3db1f6
-EBUILD DateTime-TimeZone-1.500.0.ebuild 780 SHA256 055d2e3ff55b149d9527f61ff22fa28f7a22f48c044f8d5c9f568fe0a1c9ce3f SHA512 0a6ca51a28b9bc93b39202718d23c1f42fb0e0fe8dd462599b9975b2cfef720cfe44ad3e5da34a0aefafbaec05bf8dc334f63d34ce9fd77a52dc54926c902c2a WHIRLPOOL 1094d6b1a7e654c171f25ee0bf8b5369f306340c4b1864f18d98d42e2f061021defa965d0ea5dec84a49595686cfa7c6d953c81021bda019ff27430030ed083e
+EBUILD DateTime-TimeZone-1.500.0.ebuild 782 SHA256 92e2a11cfab7eaf8cf7a98ebfa47768b132f42472d055ef5d2a98896b3ba7744 SHA512 d5dfdb611b77dc5df686cf6d6dd6c4466c26f5d69cc1adaa847b7be2efe762d0d11c80872fbd1c341f1b13c075010a2f87076b0bd7f357f0a30bab177082a22d WHIRLPOOL 490e30662362fab65daf94d276068b4deff4ada5e4a7fddb46761023fc841cc956ff1a0abdc7128612984ac7a95070633179493d2878043e79487160b0d35e25
 MISC ChangeLog 28566 SHA256 9beb7a2c6bcab5a8c43b2871d719ce112a71f6cd740e9825903b673dee10a70f SHA512 c2e4b9bf13a4554e90211fc2310b969595290a39d7c21b860b819ffd95cc6aec7bb7c015747f69a54cc4800f43d240e75bf8139090b576273d85928de55e9728 WHIRLPOOL e6afcee46cfa18ee0ca448be03f76d713a84a305b1a03e74852d3d383861b9c26b24fe83f1dd2df26fe10801c5adb7a4be508ef31c1838a4d63a4cc2e2e3682a
 MISC metadata.xml 35193 SHA256 8e17b6597114fa3ad8bd3d2ce31c61570a9fa5f4cefec990de11d36ad0444674 SHA512 9e58ae6e7c120563f041010eb17ed697d985a0d27d6aebbf92196270afb8e81ca882fc76a222b9629c5c70826f848195d166610eb8d8bd7482d9421c1e30ff1c WHIRLPOOL 0e9e4c08b3ccaefb38f5e7e648a748ae3f618b906cd8d1c5c3cbd7ab743fcc347d3ad5a15df2574156ecddfb64c83dc0b5e616d875b68035335c03ae0b826adf

diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild
index 8183d67..607dd83 100644
--- a/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild,v 1.1 2012/09/24 17:55:48 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 MODULE_AUTHOR=TIMB
 MODULE_VERSION=4.09

diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index a78f221..e580cff 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,6 +1,6 @@
 DIST Devel-NYTProf-4.08.tar.gz 413566 SHA256 e3ddb5c1ec8c44fbdecaa1990a28d16ea8d58036fcedef99d9fc2a15e6a39867 SHA512 ab19711e4dd13624673544e1383768a40e0413e45e0bdbaf5710972bd7fb6b13481d324f26b1cf5d0adcfeeed0fa10f20cb5503cd77e62efe0dc14c8cb67c3a4 WHIRLPOOL fd9caed73dde334c114f8f971dcfb98a351e978ff56387cb6fa4c9219a06227b0a90ee7dd0860f1e09f3eecde489d8ad694022bf9bae443195f9002e84b75aab
 DIST Devel-NYTProf-4.09.tar.gz 413599 SHA256 9270afc427e03c6c604bceba9450dde484191342435e85849b784d53b3c3a153 SHA512 2840e28f600ea9d814f588e6fe5df0b5b08955c12e301b67b535eab4c50fa34a63f0da514bfed5c9feea71fa01614eeaf9781ad12baf2ae0a8b019bdda6798db WHIRLPOOL 9fd878c13a90894f8269481286502751fd42afbd387ec06d5333f3e047d486edfa1d7e02aa6f773e6bdf651df3e150db83998c1183b5b6263977dfdabf02d833
 EBUILD Devel-NYTProf-4.80.0.ebuild 604 SHA256 70f3c5c942550e5a63200b986ae14bf6bd161ac900e29d74f7ea2092eb9e09ee SHA512 b2c957a1638b8ee5333cc77cd732cccad20a73050d2d991aba0fafe23e38cfd78eabfc3e2b664af18fc12a603bb3dea6af724bb93e6b64f8ea4b42437c928022 WHIRLPOOL bf0da6d5692f0ffafcaa98c0b897b343e2bb3607ef3bf6ce0e6e01025de54f5906381bbca64e836eb2e8f5b9b77f5bf3f766578a56a8b74f3ba558a23f91511b
-EBUILD Devel-NYTProf-4.90.0.ebuild 602 SHA256 7742e13c7212b30cae070c54d7ca521bd5f58bcca4bbd0e4577e5faff3961088 SHA512 60cc7d868c7b27c25b65e3db183080c1dfc6bd7beaff31a407c6b8e70aae6697bdb027d81699af94e381349f9269be51f9b2d2aec3c08a0c8323214f2fb8115f WHIRLPOOL f68280fa5e591c052d927c20f4ba7984dbba629759099e7840e2333451fc2054412b6c032f655343eedc7d9472d39d4fbf0e02cf91890eea21e0dedf3e1a20e0
+EBUILD Devel-NYTProf-4.90.0.ebuild 604 SHA256 d347100741b9a1d5c0d347e7c31e95c2cd855394e1e34ecfe46d385e91eb69ff SHA512 e1c82c582bbeddcfba91e6b555c1225eece3c65609b27e6870ebe0cc4fe4003befd0bfd14f319e4cc61b18ffdb570db34551455c252d8ea206849d2d68fe93d4 WHIRLPOOL 696569301a9e246af4028b4210d594a3a1dcff6a45573b4d7c354352df71a2a9bf270b5236095686783dfd0b98000bb366a6f9531ee9b1cf277d822355d2ba77
 MISC ChangeLog 3595 SHA256 292b7885ded77479d48fbb3632ac9dc2e15c11fe55996b646456a73effdeb682 SHA512 e641b156a3533705076f8ce52413c6586ea3b8c559a1bf2c9c17c916d405e7829f3d4aa02fd71c2d3f4ded99ab795ebfad6848d24e9511e215b4930a1b0f3072 WHIRLPOOL 02da73c6c8ade5bbf0a40ab6a0de8eacd22e4a960ab4c89b61963ec681ce05b96d8a20af3c68b7c117df3de1bb730a0daed769122ab21039935a0048c83c00ab
 MISC metadata.xml 1064 SHA256 4eaee55ab0e0a9a5e888e4a1ee5d5c3d0c9ffe5bbac6eda4d9af4ddce5deb901 SHA512 fca7267ed728980784e2c4c88a2a5952b1348ace0188a94e91feedf02992867184bd346b8b1e35a6ef6f76470b0f43c881c765694f22354c41d26ce3b3b80c7d WHIRLPOOL 9574ccfc5f6167f5ddaa8d14805457749b385f54d0517e6455c0082dfe08a8f4d372ed5a9ae4d6685ee2362d0b46c59bca01fa39a16446699b322188b61f6bef

diff --git a/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild b/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild
index 7dffef7..6757b12 100644
--- a/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild,v 1.1 2012/08/06 11:28:13 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/JSON-XS-2.330.0.ebuild,v 1.2 2012/09/28 01:27:18 vapier Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/common-sense"

diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
index 8c6d2cd..c5ccfc6 100644
--- a/dev-perl/JSON-XS/Manifest
+++ b/dev-perl/JSON-XS/Manifest
@@ -1,4 +1,4 @@
 DIST JSON-XS-2.33.tar.gz 74514 SHA256 b4391c98ad25a4a546c14d0eddf3212734d28b8c8bfce61313bd9bdf0b72c85c SHA512 bd446034f17818576205a67f5ae319b57e6fa833a0624ac402660a3c9f3e03d902cc9fadf599dc2a3c55cc99df1768810ca3f1f11617abdc50c76af6e3d71bf9 WHIRLPOOL 40e3db67f8074143e7e690d29564cdbc83d5a960756101902aa0b910ec70ea53d2a3cadc1917795561e654174d0ee09c1884258d0db980dcbad3e160b219b91a
-EBUILD JSON-XS-2.330.0.ebuild 549 SHA256 ebfdaa9fc52f849951db3341c8178bc53fc760fbbd582ab77ff1ee9ae23fb190 SHA512 0555275a07548c80ae5d3cfc8dfbd295bc990b17202f5ad614db30a123f30621bcb9c96860c959784e666e6dae626e4d71934ca35585568e04db9dbf4eeac8ce WHIRLPOOL 550b582c4b51c17a3aa1ce806d55b07e93759a3566ecf06965cfd7f0fbafefed27c65e6de0d5440ea66a4b0593bfdf0e50fbfeeda0f14a1a60330b3d2e556e2e
-MISC ChangeLog 4408 SHA256 ed399c71ac8b16e35c880fdef678e4386132222a526003fce52f445665e1d2d8 SHA512 f774adbcac83a45a6c2da9bcee917f611568147638143672d1cf1eb3e8e86bfc5af24232ee102d7dd6d43b5fbfa5ecc7fa8890d4678485ad8cf3c2c2e03795b0 WHIRLPOOL c819df7888c0e6d1a4e27afb78a07c04e8c82a1c004d06477eb88ec7ec00e45ef4751e165a54a1f5ee4cadbc71797f4ab7c0f906263cfe044b5534b33a625762
+EBUILD JSON-XS-2.330.0.ebuild 563 SHA256 73989d8ec805a74e0f2f9659fdf701ba2c35bc876b63a844ef00a9a9852ffde7 SHA512 59c3d20d0510b9f833ae302ffb129561ef1088f9e42ea3cb24a561b5b440990a6e0bc2e405df0f04d6795b182ddad7ca8f046ac2506020739dad06416e075d0e WHIRLPOOL 1036c455d5998748810fa428cd78717e10c9a59149ecf4cdb0deb2ba3ca0c8fa08f78221ca74022e13685603b412fc87023bdbcddafcf870b9b997255bbdc84d
+MISC ChangeLog 4507 SHA256 e1892f6522a7ffe420314d0e97bf3dd704ad61b24232a8b6415d7bcafef4d428 SHA512 9de509959c64c92fb50f9098d0955c749a1da77490f4c12f9b9da48e12e24493b89319fd6c0d8a87311b2be2fab3f6199bed3d7b42f4ee1160411e5f8c4ee7b7 WHIRLPOOL 3bb7cc2ada28caab0a8d1911de3b35d3b348c4af8430aaae14242c270da598d25d388e453ffef755a156e6a9efe61d7f0c6b1f391044a1e1050d86eb8cbc3281
 MISC metadata.xml 352 SHA256 04466aef04b97a1bc6f506a1fccd4a953b6dd25694e5d05b78afe9489380f909 SHA512 88f750302ca47db14bd4f507077acd5954c8a9cd00a34e87da4fa83bef13ba6fced35f1ad8a6f7e2f36960d1245195d9f79ba91d3fba7841e69745f78ea3943e WHIRLPOOL 35ee4dea7937a9260819da18e7a486c7f407acb68577b1b94aecdd66ed49c9c0f2415e43467cc3bd291040f1168a77e151787e3b97c5375d2d2c8a9042316b30

diff --git a/dev-perl/Text-Table/Manifest b/dev-perl/Text-Table/Manifest
index 41d03d3..f4edcb4 100644
--- a/dev-perl/Text-Table/Manifest
+++ b/dev-perl/Text-Table/Manifest
@@ -3,6 +3,6 @@ DIST Text-Table-1.125.tar.gz 27445 SHA256 fa19230f1b0327a9453cd4aab583f37fcbd4b8
 DIST Text-Table-1.126.tar.gz 27579 SHA256 019ecd82bd7f700b595669b4e7b937ce227f542b27e8792ba490606006a569a3 SHA512 4ee1db3c4ed49299e5243e3e25ad10df0022512c2baa71ad44d53832f4332b7ea83094e18a900e13f964dd5f1a1af6cfcbcbc3418e7d84bcf467889f52e13550 WHIRLPOOL d83b0385979fc3ab3d648e436e817debc779a9ebdfa60bf580f1a0710946f71a404a7b7042af9063864ebb47580687d90f64aa345469ce6cd1cbc13f4b5c0e26
 EBUILD Text-Table-1.124.0.ebuild 568 SHA256 29323887bfc7b4b5440f8e8a0441537466ade2cbb0f8ccb1c552ca6ec7380f0a SHA512 de331429907549a858300124aa8737f20119959c5e8acc375582af4ffa29088f8965473e6962243035f16870be44ec0f483b30803b961ce5c50b4e7a3b4204b4 WHIRLPOOL eaabd3bc9693ad5769b43dbedf47531ee52f5881148e326a4ca5c66ba397bb24d44ba1351f140d809b55fbe76da116472418a5dc6db64b2bf7aabcc6b5139ba9
 EBUILD Text-Table-1.125.0.ebuild 723 SHA256 d031e9796ffff2fec2314e3fa833995210be48ad22ae7eaa3ba324effc65f0e0 SHA512 6705bd559798adde3774766c798d8ff562709b066d9447148951dc4fe0335a4359d24627da66a75bde6d52cf7e94e551ecb06882a0a08daa8f631b364948ee3c WHIRLPOOL 991f08ecfa4bbf448043e2bf56808d62547cb0591de83622790ad204e07d263c2cb9636debc0a1202dcb974b4a9dd308fbdba571c37a0659d24e22750fda5496
-EBUILD Text-Table-1.126.0.ebuild 721 SHA256 5a05486627fdce9f5c1e8fc151f430135ae0f998672a5b5538ba7b10c280d08c SHA512 b1a9b91828f785b0a9d7881376965191829565686d1d6dd037249e9e73258ca6042852d0aa5fcf7b8942f27bb33794fbfb86ecccf2de0ed712a8543164f29f65 WHIRLPOOL 359b19b55b032a44cd59dfd4cd01122c59d4afe4da842d326d88c965f58f783d4879141089f48c84c995e489529df55053c8f7cf520d7b1d101192f1cd623f61
+EBUILD Text-Table-1.126.0.ebuild 723 SHA256 c8ff0742dff3a188b88a15693eec7d1ee984c7163b11b3b55d3dace1627d7088 SHA512 c109a47dc55aae8c56886a197966c7027e619fe4394543428a008b4cc34f050631751d0f0c2abeb8158f33e9f82a9c649c88591967355fb86ac880114f45fdcc WHIRLPOOL babdb287844e83f2596417a2a2a958fc946e9692b3118fef810f01cd8d3daf03f74c52d3653756ebbc751f9b042518c048bad905f454e6b47e498adf092b8363
 MISC ChangeLog 2193 SHA256 3dc5fa5e00dfce679c667ff467956425d8356bdc0f5d4544264c02a9bad4d88d SHA512 4e89a86eb4bd72667b2bbcb1926503c5a5ba4e3d069e3b5708a46764838c26f16ff03f65fb2704051b0d7ba7a26af52b4768bf271c1994dd071c9efcaca5b41a WHIRLPOOL cd77847d20173dad19cb5200333755b88c700104d31b5677db67d59bf345f9df7d3d80a28c623d0dd6c4cf4576820a24e2f29f3e2d82be9d0da5bc5e0499e580
 MISC metadata.xml 397 SHA256 1e712e8ea2a18449d94bc05163dacabf5061106c66a44b812818948283506cc1 SHA512 dccf133dd08f63d89896e1b49d1ce5e35c57515405c618b19a795b570485aa2135319bbaf94a120dc15d55dcd30b0aa345816438f12061f3dad942f31711ec28 WHIRLPOOL e2863c3d39120638e7d33bbe9009a31c91c63ed2e76c00f30b8eb4f5caefff4fe919d325332f2afdf67c0c2622bb1424cf9c77c9985dd3334920974ab2c5cb77

diff --git a/dev-perl/Text-Table/Text-Table-1.126.0.ebuild b/dev-perl/Text-Table/Text-Table-1.126.0.ebuild
index dc2c4fc..9214f60 100644
--- a/dev-perl/Text-Table/Text-Table-1.126.0.ebuild
+++ b/dev-perl/Text-Table/Text-Table-1.126.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Table/Text-Table-1.126.0.ebuild,v 1.1 2012/09/24 18:19:11 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 MODULE_AUTHOR=SHLOMIF
 MODULE_VERSION=1.126

diff --git a/dev-perl/Wx-Scintilla/Manifest b/dev-perl/Wx-Scintilla/Manifest
index c41808f..d29ca4b 100644
--- a/dev-perl/Wx-Scintilla/Manifest
+++ b/dev-perl/Wx-Scintilla/Manifest
@@ -2,6 +2,6 @@ DIST Wx-Scintilla-0.34-patches.tar.gz 488 SHA256 3ca51b083080d0e1943c24db04251b1
 DIST Wx-Scintilla-0.3801.tar.gz 847738 SHA256 97283dc197c866050fc35fcdea347e2ce82c277727770a9ad097bdcc346eddde SHA512 723fb3d9e58d3b1ba7010675e35d8891406278ea60f4a8e07eac5fd89f85cdbf648a5607c60480f01217ebc91acb8bf586e8eacea04e65763c54089d3036b3d8 WHIRLPOOL 4a4df95a7917d1984c15e89dc9d0e5efd6166693f7cd8ad7907136805ccf6f2048eb183fb5ee73f4f5a933a87a36ca22ced4dbf1a300393923dbd405999fa4dd
 DIST Wx-Scintilla-0.39.tar.gz 848565 SHA256 d6d67528a55552bb3fda2a1f22058c6c94a05eaf632dba5331afb3390defe0ea SHA512 d9ecec347c1f1382788e5ed7708b0caf86f2ff87db0fdb2b8fa07460c96b1a7921a9402431105beee61f4627f3694a79db7515ceb76b1ae4fb3f95c807afb4d4 WHIRLPOOL 229c694683e939cc1110171945aa18cddcb989c63e33c032ae755ba878717792d88f9670f968bd989e58c62066d7e8d4035962ae58975970876a6741a8285560
 EBUILD Wx-Scintilla-0.380.100.ebuild 884 SHA256 521d6deede58017976ddfc888749658ca5f5514de575a34e74e878c8042d0c4a SHA512 323ca2144c5e2940b4f9d2c4cde20a10dda08a89b14994db410e3767f036afea625b31d9623a325d1c4fda4cc4a7938e25acbb55c24645e647de32b9d6b8adde WHIRLPOOL b3e4017f1f9afb35b28b46c1c08a8fdcbab46907156eb2dc69c69b0637372dfda67affbda4d2f45528db331dc67e8d2c311cf8712be767d2b2df3481a774f548
-EBUILD Wx-Scintilla-0.390.0.ebuild 948 SHA256 d931e614960a698d5d85dd8dd95b4fddca2811ddb9a0890f32da447dd6847313 SHA512 92dec2c7875934828db029620f5cf7918193b20dc2269103017e006e275c12c120378a3905622c6f765c89219c6c30a1eaeb7fd39642889818c1c9ed16412c98 WHIRLPOOL 8dab5246201f55883a5fb40251d8cfe762a163cfc7158de9ca5ccb173bbffa1bfdfa128da00540622c7274eeff304f2adb44dfdca6ed823083d7a0f43f5659f5
+EBUILD Wx-Scintilla-0.390.0.ebuild 950 SHA256 b5cd8ecab1062140838e6620b00e1d17ec5926ba88c3942ee3d2073818a82bc7 SHA512 37b670d008f6e8e2f91276411758fc15b65b9f95d84c2831c38d0615087eac4ae4bdcd0ec353374853015d3675b42b0ac47f3abab752151913262373876bf3f6 WHIRLPOOL e4e49bc31db0c96f66ab79bb658e4c4cfdf69092186d0d7acac1d3eeeb0dbb0d442ba43f29343b7e64a5c776b5d46846a28a8358de817b15de53047d4f047080
 MISC ChangeLog 1211 SHA256 4638362fb345e248cf515e2b5ef7250a01e98ef04373e9b427504d445a02d263 SHA512 d7f679c5882d5edd906a43fd9a2f6127e81a8173b6aa6b01f491ffaeb3f55f2df999cd9a4f8906415f17891adbccbe2684356f3e9bb10dd309f1037e990cac75 WHIRLPOOL 925045ad8de4d8bda86a73f51d25e140e2764c729c53311cb686ee215f59038d673cb205ce520b36aecf6335fbb7a175394bc3c8116e1a6f1104e4066e788ad0
 MISC metadata.xml 646 SHA256 3aa8bb78bcfe0310bccc2312be902982200330eeeec136416500a2e2c91d630c SHA512 45fbe21c18b8da0bc82c110a7829ee07432afc3f500366204862e6c6b08fa376aa7425569067ad42da33228a5e3ab22ee2b325c2aa8674a69dca01e31c111133 WHIRLPOOL f42a911774e430fe21ee5746a60c84eb1074097a825787f3cbb217411abcb56e589f50dd1a7167d843c770b689d0e2aef6fb6ce995b82ca3a0bcd863ed9dd420

diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild
index 20b1813..a0d9281 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild,v 1.1 2012/09/24 18:17:47 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 WX_GTK_VER="2.8"
 #VIRTUALX_REQUIRED=test

diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
index ecdcf56..92924c4 100644
--- a/dev-perl/common-sense/Manifest
+++ b/dev-perl/common-sense/Manifest
@@ -1,6 +1,6 @@
 DIST common-sense-3.5.tar.gz 12166 SHA256 235d1116092e7ef88bf6e695c605d9ec1c7b530f3544fdb2431dd59a82f5a3be SHA512 b9d36dfaa9d076a0c0c1b1f9b3800e7c8e803272777ebbba6360a97f26b98202c2ea72096bcbaa2413fc17b66ba53019bc8e75ff3f2934f99d3b5f733b7bd7f0 WHIRLPOOL 07e313f1a24e8aa6f422379fd93e0a9e1e7d82356c97219a359df484024769c04df1de042cc9358e787d5ec4b2fc362713fde959782d12c05558d349bb49bf5f
 DIST common-sense-3.6.tar.gz 12594 SHA256 86e2c2e109a7dd4bc5441757e729d7d622da125c6e14607a78fb56e057b86b5a SHA512 1b4acf6752dfcfd1ebaa657c84221f78f7d9755ffe80d1d0254bbe5b09ae0107452b83e6099165ed469a23ffcc46a3bcdf5526f3c9cb6036e22dc397ac760ee1 WHIRLPOOL 606a3a9ec3316c758251d2c7d75d94d092bdbec186efe857e5eed3d66a64909a274d1077672185b9b4da95c5b73211cb4253aa0c6068549b6bbbc499d47e9e90
-EBUILD common-sense-3.500.0.ebuild 459 SHA256 16ec597c633e4b7133b4c1cdbf6551798f8873a720cae226c82a2f0fa87f5f81 SHA512 ddcaaabcc1949e48b87be854451b1d5309a8bde99e83d24322bce5ca5febac097433d9515c43f15f497056375acad86bc50652231b70b478607e6b5d04db981f WHIRLPOOL 89b863c4699c14c6e97990be9a17d8c15e684a31d26ae94d1a481031c915df6c170cead906304ae985230eb5ec9ed9f408468cac62b6d2db7b569d176fa2ca7f
-EBUILD common-sense-3.600.0.ebuild 453 SHA256 d516e0a5e0ef6676417caa031bd2cef971bde97c4315ea3ffb2b75aadf419892 SHA512 7fe0dbe703a0d950557a9a3aab62dd0a1e6f844bf1eb457d0d6100b1861c43b879f403c7938e03ef823b6fb44956cde64a5985a932948fe83e4c774b9962c390 WHIRLPOOL 0c653713b8e007180520f642258d0e1733b22f974d148ef0ac4ae5d52cb2943a5f1d4934945d1d9066d0f8c0d2b233dc0ce161a21aabf580646c42c9250f1149
-MISC ChangeLog 3439 SHA256 fad90e8de835a05f8a4c23da8a467586baeaed87fefb4f04b206d761833ff7be SHA512 a42f5be14f3684dc7d9d8416d96df01695a3d37350fd66973dc8a91458e790c30aa25bcce74cd4b5ca4b15e1f1d284037205b88a0a13154e0c7e3b2a02148c3c WHIRLPOOL 00efc7e4d27f050ace26046f5d8da0afe0340c989ffeb54a302396a9291522c50286156c05e1451a153ad0f139761424b0b95cba5efc16c63c7929f11d4b9a7c
+EBUILD common-sense-3.500.0.ebuild 462 SHA256 c79bfb078879beb0ece3a81159ab62b8455926d80f330eb5e76c80385b690aa9 SHA512 af5aa8ad0d704d69914daa62d244bc91b939c250fc3f25b3bb97f477b2ddd97a1867b14168f225a9ffb26b9d3b1cb50bb7671191f6565ef5452bbb4cd3855be7 WHIRLPOOL 1d3d6567e046c39494edd75ea089a992c3739332223680994562848f6c9486f5123b2ecf76adb6ac50340c9db01cead0f14a7a9b59162f8eceb60c9de41c1d75
+EBUILD common-sense-3.600.0.ebuild 462 SHA256 3f928fe5911bb345f79308a2ea14e8b19e8b111076766f24826ad5b43c1727f0 SHA512 61833efe401b856d1ce3be8fa5b401584e01703ec4fb8482149e9eb912ddebe0629bdddbda8fe04cbe4d150b9b17a815ad323ae14e561f2b805ab766c7a07a5c WHIRLPOOL e9c164eca4a83a604690f6288a8f5e313eeed5445231cb14ad1c37d847062c41092191465c2ea0a6bf1cdd4daa4ca031b6650962971331415d6b4d8026863072
+MISC ChangeLog 3569 SHA256 dcc635cbe8219d85d871c74e68893299f61bc5bcfced4e09c3a3feb26c6df047 SHA512 7c7f05df769a89365a54a04c1305ddf66615b60416821c2d5b29508e7a8b961d5c0136a21ebe9b22d03e5ed9af8128ba9690c748f7eef923a215f2f7c6999c67 WHIRLPOOL b9a7aa60c3da72d564ef2a038aa6dd82adb699a78e987bc15cd7a390658022aedd749782039d10f4892de979bb2f7dc36ff41420396e9915379572b9e65ed6b9
 MISC metadata.xml 307 SHA256 cb2d7d7c61723212e48c816e0bc37671c54d6a1cd58acb16a04dd8f10dd76275 SHA512 8b9498a924e3c63a3f0ad76d25da6d089772d9a74b8fb491fdc2439955000491a2c9920d9e42311a34a191ed8eb012385760fd1066f05e38b98b8cd20c80fd5e WHIRLPOOL ec2587a0e322fca74167f0127acf1be2671110bdcc5fdf82b164c6e31a288568dd55f1b824a06ddb30c9545659497c81e8e4266cdda59b487352033d6cebed20

diff --git a/dev-perl/common-sense/common-sense-3.500.0.ebuild b/dev-perl/common-sense/common-sense-3.500.0.ebuild
index 98bb1ce..33e6eae 100644
--- a/dev-perl/common-sense/common-sense-3.500.0.ebuild
+++ b/dev-perl/common-sense/common-sense-3.500.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/common-sense/common-sense-3.500.0.ebuild,v 1.3 2012/05/21 09:42:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/common-sense/common-sense-3.500.0.ebuild,v 1.4 2012/09/28 01:26:52 vapier Exp $
 
 EAPI="5"
 
@@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="common::sense - save a tree AND a kitten, use common::sense!"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-solaris"
 IUSE=""

diff --git a/dev-perl/common-sense/common-sense-3.600.0.ebuild b/dev-perl/common-sense/common-sense-3.600.0.ebuild
index e580f41..09c85c0 100644
--- a/dev-perl/common-sense/common-sense-3.600.0.ebuild
+++ b/dev-perl/common-sense/common-sense-3.600.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/common-sense/common-sense-3.600.0.ebuild,v 1.3 2012/09/12 11:16:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/common-sense/common-sense-3.600.0.ebuild,v 1.4 2012/09/28 01:26:52 vapier Exp $
 
 EAPI="5"
 
@@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="common::sense - save a tree AND a kitten, use common::sense!"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-solaris"
 IUSE=""

diff --git a/dev-perl/wxperl/Manifest b/dev-perl/wxperl/Manifest
index 5029ada..23fdcb5 100644
--- a/dev-perl/wxperl/Manifest
+++ b/dev-perl/wxperl/Manifest
@@ -5,6 +5,6 @@ DIST Wx-0.9912.tar.gz 465242 SHA256 82b01febb67f638fa7f97244789e030d8f27b635d42c
 EBUILD wxperl-0.990.200.ebuild 654 SHA256 5856184976cdea920e7f15f1f92a20651602679fe9c49f3fb4d19874d915b3db SHA512 c7dc494ca73d62315c04c83c5170a045fd5f36199d2eff6a2a0e0ec7ebee5f74b90346ec86ece5b793fc548c10a5ffd7aa5c9776ee7e27ded959552e0bcc1627 WHIRLPOOL 4a796f945723e7525e1a35ab9c5bd98d39ceae9e5750dae88d4b70951b9c16d1ccf817b469cba285c9d459c8ffec8d78c9618e69282bd93ad3c7c818c9f3f001
 EBUILD wxperl-0.990.900.ebuild 654 SHA256 e24cc05da37f6db7949526d9687aafacd626fb998226c2093b2fd6f79e1f579f SHA512 45e2000c6b3d7327ec03ba55c8c7effd19023b50748e0bcd2db3e668aa631db367d09771200d7e70c64a16859e3868edcd0a4722b1eac53e71aa2258d6f8844b WHIRLPOOL 8f0cb10523f6494552b44ac27286d845f8a409f5f3943069beaa5413dc20edb49672cfb5021124bb6c11f54a0114b9c52c5e28a85eb7f55e652610514b1e012a
 EBUILD wxperl-0.991.100.ebuild 668 SHA256 3ffc5768eb39e787fa27e1b5f0cea75af2b4f35cee83bd3cfda522d2dec2aa52 SHA512 3d9271a994211371b6180b1550c8e752906322a5b0d4870f44f32e0aa1ce7d629d1a7eb5dc4a0e3ea3eca08a9bb8dbba528c657d627a98b20a884276b7093290 WHIRLPOOL 898dd20f9424f2e215bb63dbbd053cac13d311c30b2f106babe336bdf959b69253b33684d46cb009ca4db725ed902f09bde7ee6f89be128adf9949ccfd2b46d3
-EBUILD wxperl-0.991.200.ebuild 666 SHA256 4f713cec4916ecf5e818fb7004cdb45484fc7c9b10f7ce8bceaadb88e19eacd6 SHA512 f2e364b061edd6b322927fa03228728a267774d3d01e94c5d938c0dec310246f698cb03c2b002fd12d5a43f11992dc9a4ea330a273f5e491a1936f19c3a14164 WHIRLPOOL 78c6ab6b132b11826304338f73e0cc6b4152d1e3f6e3be29ccb76a974b53b6d03d1ca89e0ec13e40c22df5160e8dc6b330737ca04fb0b4104d4139651b08bee8
+EBUILD wxperl-0.991.200.ebuild 668 SHA256 b1046d40a13e1f5429d55842e815e457ed9ce288085adfca6902a5b6842494a5 SHA512 155fcf0b2c1a7a90a2901200dc40e075f84f37b16b6a4d2100ebcd15ba974da96323f93e6918fc868dbbbd55fdfeb0128fe680f77b3d46b526000f1f41849890 WHIRLPOOL 5869ecdf183998bbafc499d1b5dd51e0abde4286d28984d258cfff710d484ad851a7a2bc809bc7e9ad997c14f4238ae6eeea4fcc0c469d79ef03f4a97db3136a
 MISC ChangeLog 7150 SHA256 b0822f052019765fa453e36dfb554a4925b13b3f2bdf6766f7856e728459d8c3 SHA512 8c4b8ec0472c5059fbb6414e41a4e94656a18e905d00600ee6e97a4a2890bfa03ed0b9abf7331d77891dd8dee5b925063b371ca7270c8d5bf7ba3e9efc526704 WHIRLPOOL 1e6278a24bd181402e0545b613c7c679f93f3325ea9ab6e13258d4f8afd2db995d9ef0904c6e9f6243d86ec5c8787260e11a4418de664ccc2b06aa5862abb3df
 MISC metadata.xml 19384 SHA256 ca32fffc518593f84ccfdeb3d0a5eddf9f431d04816a4d644bd0ec19e1375b09 SHA512 960021b1bdb2dc1cf2148b1a13ed1d78dc5b5fe831790847edf87e09914d82745ebae2ec5b63e8dc192007f4a410ee9f4dbcb47b9c17f84960ccf2f9a90c7201 WHIRLPOOL f8970045ed0d264d4790b6336442e252391d5c4b57e15969e742d079a6ad618ba6ea09a108c1f062534c6fb3dfc857e53cf09e35ec9ddf22e89913fb0261f794

diff --git a/dev-perl/wxperl/wxperl-0.991.200.ebuild b/dev-perl/wxperl/wxperl-0.991.200.ebuild
index 3080c97..28816c0 100644
--- a/dev-perl/wxperl/wxperl-0.991.200.ebuild
+++ b/dev-perl/wxperl/wxperl-0.991.200.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.991.200.ebuild,v 1.1 2012/09/24 18:13:42 tove Exp $
 
-EAPI=4
+EAPI="5"
 
 MY_PN=Wx
 WX_GTK_VER="2.8"

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index df0b36f..d33fa78 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -5,7 +5,7 @@ DIST geany-plugins-0.21.1.tar.gz 2652907 SHA256 e9d6eb4a65784be0a5c058f18309671d
 DIST geany-plugins-1.22.tar.gz 2836541 SHA256 3ea2b4e61934bbaf710222a4be15aec5c334fcddacf58194f006b7ee9cd9e768 SHA512 c5e239219e46bbe206578ed91f52ba044ad8c1f5a2b165ceed1392f39d6d8eb85447a0abb3359cd7ae48489cb41ef4f9b7ed6aa30d5adea0fcd037f33e90fdd0 WHIRLPOOL f745869183ee02cb9f320e8e5190f6f6cc7ce048e60c416509acf2ca152084da4b39f6d6ca35149dc55eae2e633afe8c4563eecddc98e28b0c82d81cb4ec6f3b
 EBUILD geany-plugins-0.20-r1.ebuild 1665 SHA256 2bb7d64f10ce990e93a74b44980c7b80011860005088260818356dcf2c4aaf34 SHA512 469651afb13f4f9e9459325fd70de6195cf257b0d23787785dd11d4e83bc8cd29b437a968400aeda85359b1cf57775fafa994ed2b9c4b04315d253554943cd74 WHIRLPOOL 108e1e1eab285659b09229c412854240cfb2191297006082c19c996551a6e88bc4fae9ace31f815177886e169079da88a350a3d128a886cd574789efe2423057
 EBUILD geany-plugins-0.21.1.ebuild 1677 SHA256 64ec29971d0f6d785cac4d19ac5b10011697dce9c085b328f3bf4c207a288316 SHA512 e371e38e75159338bb2c2fa50cbcf7d495cb31168a77145af31e71b27831656f6f00371762997fc928b6da6d2859cf46f57cf5f882a48236ef3228c6b9f453de WHIRLPOOL ddd6de6005be131bb3f39c991938baf1d79fedf8e7aa211a79ce72ac403be52f6160c07d20103d57ebe176fc0c40035f9f7218969dabd3c3a61526410d2ac709
-EBUILD geany-plugins-1.22-r1.ebuild 2138 SHA256 d51d63428f6e51fa539cf4db6321bebfa2c1f938f7f8c583e479def22102e4ea SHA512 47425244e86880ca0d06919871ddf7a245899d086c15910542fa10c8cd9b89654aabd79cbb9b0c22dec4b238253f68b22b3f8114ef21aa546f245ed83f73086f WHIRLPOOL aa28549e4ac59349e6401b8cbd3b048311747041c809ef0b98ba2f65b98bdccf8ee36e94199ca4a3073b808e05feb89491781deeea284468ce61ca793f0591f3
+EBUILD geany-plugins-1.22-r1.ebuild 2142 SHA256 6b5f9e0f639d91277632ebd244763240c88b8b068e770aa7fcd8eccb9cb5df63 SHA512 549626656cf52dfa5ae9b6acb41a2b190a93636d71a9fdc25b535df8a95da60ab5e064c4851e1cf73ec09d1828856a0cf284dd6b5e2ea05f0d5e5d211f780043 WHIRLPOOL a3fd90cc93c308c020be2ba525d68f67750c825f6d57edee884d9c4e0e293307efba0c2a84c928e774c6aa1ea5eb534662aba39da83b53ad5419ce278a99ef6d
 EBUILD geany-plugins-1.22.ebuild 1960 SHA256 4979caea946964250fc2e3654187da3aae99d2a800b2f9bbf367369a879f4d0d SHA512 929b599c0095d0d91b3288cad12541c6283f3cfb2f715ecd3d43131a9eed498d0dfdabebfd437b1f7cc939f217c9713661b9db5f2c1df70e96e8c7b723ab4056 WHIRLPOOL 78317c47f7334cfba09699f98c26af45ae88c4c8be2c5794ce23411b230d8c13ff3d9da0ac9c2fe13c782156a2a93b393685e2789d8354242a288f5f01daaeb2
 MISC ChangeLog 3784 SHA256 006d22ccca087b3ed53f45d31a456a771cf719206dafed1b90481d37d72d4415 SHA512 82a07bedb9f0971c88aa07b4148ceae316af139ad4d7b7374f80a7805725ea73e2cd02a7806a87f3955249294913347986a44240ea8e0f1bf81fca92ff117e73 WHIRLPOOL 941b7ff0b27630b4d2b73955e2af280dbf31ee4825cdc9b9b9b8992551ede36a8a8c30c96fcc27d40e4148ddb0c7a59e7848744bdaffc7a23a46d9b0c9221de1
 MISC metadata.xml 980 SHA256 8c8b2e01f44222aee29c75fea76da9d41aea9fbf0b3337f9525e7a5a58a71820 SHA512 64092d74c34f8b7b0d0e418fbb0fe79800a44718a8c86f95c2e9e811e42b430c3ccee3a6c513085d4a6de8490071a93b00562e2242abad5892005f87797573c0 WHIRLPOOL 19517c6bcda41e14848b0c94d616f089a9e4a48131db02d98aaa2b9c8032eaa1373eefe1d62e1febf8e3f3b3cc1a7edd5c206526e739c5fd839adf7b860494f2

diff --git a/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
index 468d000..a82567e 100644
--- a/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild,v 1.1 2012/09/26 05:33:52 binki Exp $
 
-EAPI=4
+EAPI="5"
 
 inherit autotools-utils vala versionator
 
@@ -17,7 +17,7 @@ IUSE="debugger devhelp enchant gpg gtkspell lua multiterm nls soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
 
-RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
+RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2):=
 	dev-libs/libxml2:2
 	dev-libs/glib:2
 	debugger? ( x11-libs/vte:0 )

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 0c57c52..0a74418 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -3,5 +3,4 @@ DIST geany-1.22.tar.bz2 3198289 SHA256 901a35a7395ef10a80fb10b3ab63bae3871693a4e
 EBUILD geany-0.21-r1.ebuild 1438 SHA256 76486248d4b81f80f83c4b5765b7d041689477a0e32e0c7d9ed6df190b13881b SHA512 1455950903de12395a33843a6f7041015db8825db2848fced346b44a19fcbe335179b5581fc49e0908c318fa719d51434e892f68a15c68bb003fa69934feaec9 WHIRLPOOL 5cfeb108b1a74e765725c82a8aba063745d399bd6d891ab54454613edab251b9ce61bd2845cabf884989d2a4ebaf49bb71ca6b01e3e57802cae947f5d93ba922
 EBUILD geany-1.22.ebuild 1458 SHA256 fb05b4d950bd31d1bea128e2f1b6c6c2566a140f4893236ee7c148950e86d900 SHA512 5bbe2ef0d0cca997d4c4c68108cd5e3703c4f5ce03e9fc4870436f84c7c2b3587969cbfefa6d142e2b3f62361211d95db1a11691082e6e297ceb3ff6d86b600c WHIRLPOOL c04bacdefc3ffe42155bb604400fbce9c26b6ac77aab47f11703c04c3d47010664b86e26422f175f9ed5171aec6c4ac1af5e9ef2120f22a3a8cd6bea8b2b2068
 MISC ChangeLog 7472 SHA256 c0725b5382b455b1dd3f9f465efb7d98d01158c0032646babb9250b7e2603c1a SHA512 ec419e9f80c20b4eaec48bdda87092c804258eafa8bb517079dbac148bb239cc86fcac12ab9acc3203ec9f694fab732546588cb4ad5e1d00223aed34891db378 WHIRLPOOL cfe9ffc62c290ba436122502332577b6f83ca6dfd0756cce6b56e2125891ec1a0e5de9c3eacde9693042419c41e52113c2149d5ff501ea9899ea62beb2986792
-MISC geany-1.22.ebuild.rej 341 SHA256 3f64f8e1d2f7a2faf2b331a280fc3b1602918d20b970d52e3037f8f21d9128cf SHA512 c7312a9c663dd771a3d29b622f31d441adf8e898a682708acc707163d792665f529b2c5776967848cf614f53ebfe3fed7ed2df668eebb63d40ffa5004c11b1e5 WHIRLPOOL 1de072cd5a92d1d5bb78417f3dbca584572306038bf4a34ba9c95393711db8df93fb240ba7c425323d9aa55e1519171fe08ba01f7e8f50f0fe4c30520f00a158
 MISC metadata.xml 1922 SHA256 2a7ea9ffd1605dbce99497564a98bbb49d20c2d62f11fed8c1d39ce7988645d4 SHA512 8d54c284469f12733610b66947c75e055bb46f41213573ce811e8fd2d48b3a90e822c753118d0a213e0f1262dd513681dede592fd27ef814b6455725ab186e57 WHIRLPOOL 041975002890b1fd0d28adb1823ec38da865efbd307666777fb1839c5e9f82d465c497f8e846845fa692cacff221e6eb0eb53083c0b8867fefb7e3d23d5e1441

diff --git a/dev-util/geany/geany-1.22.ebuild.rej b/dev-util/geany/geany-1.22.ebuild.rej
deleted file mode 100644
index 92e58dd..0000000
--- a/dev-util/geany/geany-1.22.ebuild.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev-util/geany/geany-1.22.ebuild	2012-09-24 09:44:25.000000000 -0400
-+++ dev-util/geany/geany-1.22.ebuild	2012-09-24 13:58:43.000000000 -0400
-@@ -13,7 +13,7 @@
- SRC_URI="http://download.geany.org/${P}.tar.bz2"
- 
- LICENSE="GPL-2 Scintilla"
--SLOT="0"
-+SLOT="0/1"
- KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
- IUSE="+vte"
- 

diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 3791203..a3093ff 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,10 +2,12 @@ AUX feh-2.6.2-debug-cflags.patch 197 SHA256 77a833f28852c3ad6b0fbd03ce93098f31ef
 DIST feh-2.5.tar.bz2 2227722 SHA256 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa SHA512 0371185612ad052bd74b9056c2820b60a9529727130910abb55e7df1f2440fe00f1e04448428cf2c33624c467b486c6c66528d5dc116fef92cd6e879f28c77f6 WHIRLPOOL 9373d85815c237f41393bf00351a16bc3f824dbe98298ceb56f69b941e5cf34376ce20ff213a0f419283c873c81ba7504ec21299aff14dceeb6ad85711bb8cfd
 DIST feh-2.6.1.tar.bz2 2238724 SHA256 36edacec2f8d0d13035202e68f09ccf5d2ee5dc1d95157e8ee6bcde9c0a5283a SHA512 821fd1a5965cc66c1fe74f14b3dbf059379504c0d2d85b0299505c9616dfe340e61e07efc7b9317b9a556d687f9059c628b0afc738acee3c634aad2f9a097266 WHIRLPOOL 785b74065958757026f8e0775194cf3ae77f817058cc0b35179f002e7ea3e51c07006b8a3371c48f5b70979a13a81a298a35fd9a69b78ad401d962a0ef78ef1e
 DIST feh-2.6.2.tar.bz2 2239073 SHA256 6758b68ec133bbedc3373966129a521f35dea2f354ed6a571dbe7a9bd4ddf5ca SHA512 4a4f7d905bd922857e08b4422f8c5b019c9e62cb56022f0c29dabec1ca60ccab4b0f73387d782962aef8bbcd3d37f86d5e287f329e40fb4edfc3e5cc3edfe499 WHIRLPOOL 63f6df47197f0d546d64167554333622bc70d858be229e5bbd9182a33b6e3dd7afc4af3629c139f2ba25c4e65f6d1ab92c8f666f5fe1e18a5e2d7363d1c5fe5e
+DIST feh-2.6.3.tar.bz2 2239258 SHA256 f048506b0df88fc2eb35c944feb03069456ada3553cfb6f2da1da3ce2d2fb09f SHA512 d4619170951225bd53882c945bf76ca10f7a2f2981347fe0d7c9d45cfe029aa862a77a86b077c43e411384d3f4e10b775e714960e57539ba9b6c27ad99416278 WHIRLPOOL ee43917ace6f9e914d6a23a3ed43f8edb6b28625a6edc01d303342b47267ba3a50cd5cfe4c996bcec98f5d7b6a7fddb2e6a08c422043a3b258faaf24609aad9c
 DIST feh-2.6.tar.bz2 2238237 SHA256 172e248a2f2f2b87652598823a3bc51058ea9d4f0378e6900723bfa34e345e7c SHA512 34da10440843ee55a5a3e35de33bdb47e868c9f4081772bb53c012eedd64f02ba28eb646d6e5efa61b4e5462d3c5d035ccb02becce2604fb4f6bcf71ff76a461 WHIRLPOOL 62879c942c2de155451c24d05cb21456b24f0b7052545e665b43c287a8524e17c48739d74e99b5ff66ccaa2c53505971fc8df75234b0fa61790a6d8a958cbf09
 EBUILD feh-2.5.ebuild 1251 SHA256 da2b5db2db2187233c5225146767618a13aeb7ac79047d2fe47f8384e054d2b6 SHA512 23f70609da7b632f5f991bf8a760e3514ce467ff3e50fbf04e627c3caea909e6fbdd0026dfe73edf82927225ceef4cff4673c82d2f10cc48084ad6331ba1bd04 WHIRLPOOL c68c49b2f446795a420615bb4eb0e8e3268dbe5c675fcd50460be9f2490a0409faddca34743de7bc131e16f58a917ff863f682531b93e8f7d805fada4e981e9a
 EBUILD feh-2.6.1.ebuild 1341 SHA256 04fa8ff4df95c21e135e976cddff50706cb1f2a12bc0d101070c96998976c0d8 SHA512 9d540a5801fd6e6bfa9d874ba0551f17c47266eee4a4a275cb34448d2952a878e54ae9182de1676043fd69c1a169544ce46cf90da02b73fe9515ec9b9221c6d5 WHIRLPOOL 5bb44802d4574b9fbf625c846c7e3f2fcd7948d253986301ec251a54bb903550180486901b9f3133ebe13c9506242d2fc67a542f719b529c309746851d80e625
-EBUILD feh-2.6.2.ebuild 1403 SHA256 df2a7819c00e50d8e85c1d1cb02e183d7a9c4b68e1b884c9f30b133a4ef2d935 SHA512 1a4ef4a0ed671062d36eae9faf85d5786876c57d703c7df39fdecb9510e2a4139754de9cc83db25e73a8c213776c952f4eedc4045b4e37b2529395d1148d1028 WHIRLPOOL ba4aa4e34ae030d91aee835576768006c266a76d5ede09fbf8973fd72e7950de147cf49bc20f16e518970f0fa1fd68b7e82aaebe47b3eda59cc0762abb018c18
+EBUILD feh-2.6.2.ebuild 1406 SHA256 cfd65b446082faab9864f24354a07328439ca27dd38e29d02df9a0812d0f1bb5 SHA512 ce551ec19d314a41ec6b51a230e65efee81c8aeb9886454b1d1e895a6d2b68b17a1e3d809bff3ae213d1abd60f0f4861d3b9bb8b13252b3544bdfd350ed4c657 WHIRLPOOL dc443b08a8b0d8f513ffdbdc91f601fd41c32993c8eb542cee264af13a3937cac5427ec4570357b0405d67ba16925bed4742361edcdcf2f0cc29de2c5d06d494
+EBUILD feh-2.6.3.ebuild 1413 SHA256 14d99beb4b8d959f700902f447f3c346f296d1102b39cc59fd13875103659f52 SHA512 48e5fa464feabb72b4710a26a397ac6963ee4b4e4403ec8efdcbda5b11ca76f089d89317958747429b7045115a9dce17279950508d89fc81b0bc91531e91fe0b WHIRLPOOL 66538e81d0f4c467717cd159858827d651203c9d548fdd4034fc3b2de98385d0d90300c2f4dfb6d27d19e4b5d97bd1ba265a35ec96f3a6648aff1d21d523e1a1
 EBUILD feh-2.6.ebuild 1338 SHA256 4c717c2915394fe49ae95bcb9c1a1c7a7ce51d62a7bee003088384729439e1c8 SHA512 0a6959537d67c458137f4183096754347d272fe3ef04fab8f68c409e0ab0fb6f264b019754ab6bd856259b61be188eec6906926094fcf23838f3b0169a9bffa6 WHIRLPOOL ef683bb7de476dc2fcc337860af41a9b0d819176097e954a3c81dcff546989ac66980838f70037a16078930837de021cd9b8381df97461192c694d4a41770a61
-MISC ChangeLog 13125 SHA256 0ca39dde52dfab232b9765889e299ee8a50fef270b1c311ce28de9874cf4e598 SHA512 ea966d2eeb5083d822eaf8ea618bd14a69a10ddc003596be6023afa824157c38b100f13172cf4c580b6161a34327cdb69a441de9f2942b8004d1adee55314f23 WHIRLPOOL 5b5abc5569e4aa1e200dfa377b3909d53cf696a8553fcde7f090eb90cca9ff07fcc3bda96cd036262ba145a0087a0c0afff639dbf95214d493ba8f7b2b0023fd
+MISC ChangeLog 13236 SHA256 a56af050bf847b69ffaa70fd65f2357631a3c63d1b7b972df71fb0749e50ef01 SHA512 dee1c0cfb83ec5d1d29512391bced8ed1e6de4f6c98fbed52a8604d21669e73fcfb9ce630ae02a713080eea17fe4c6c8352a8afb27b873840c35b27d4dfe8210 WHIRLPOOL 0465e1639dae531bacc34860ffb2076dc4d03f66eb13399ad8d20d385da0b92f0c15ca79cd413ad8147e3a8c86bbe0c4a08bd92ec5b26be4fab28eef537a99c1
 MISC metadata.xml 357 SHA256 91c6ea742ef1f0bf7cf47634ccb91eadcb32624c300f782511121d7420e322bd SHA512 db8eb56cb6d97712ca557dacd10c8705058cfdae7a3136721606096580c89bf3199575ddae0e0b37389885e98abd60946ef106ec9e5f392091a965705f8f6719 WHIRLPOOL c703225cac865456c5c63d7d777dc04df9e556bb7661fe4137fbfafab65bc76c7a6e9b7ca7e12aef184d521cc22a2123f4abdb178241d3fcf27ef6c3773696df

diff --git a/media-gfx/feh/feh-2.6.2.ebuild b/media-gfx/feh/feh-2.6.2.ebuild
index f7d0493..36ac429 100644
--- a/media-gfx/feh/feh-2.6.2.ebuild
+++ b/media-gfx/feh/feh-2.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.6.2.ebuild,v 1.1 2012/09/26 22:18:24 radhermit Exp $
 
-EAPI=4
+EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
@@ -16,7 +16,7 @@ IUSE="debug curl exif test xinerama"
 
 COMMON_DEPEND=">=media-libs/giblib-1.2.4
 	media-libs/imlib2
-	>=media-libs/libpng-1.2:0
+	>=media-libs/libpng-1.2:0=
 	x11-libs/libX11
 	curl? ( net-misc/curl )
 	exif? ( media-libs/libexif )

diff --git a/media-gfx/feh/feh-2.6.2.ebuild b/media-gfx/feh/feh-2.6.3.ebuild
similarity index 85%
copy from media-gfx/feh/feh-2.6.2.ebuild
copy to media-gfx/feh/feh-2.6.3.ebuild
index f7d0493..732ec88 100644
--- a/media-gfx/feh/feh-2.6.2.ebuild
+++ b/media-gfx/feh/feh-2.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.6.2.ebuild,v 1.1 2012/09/26 22:18:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.6.3.ebuild,v 1.1 2012/09/27 21:51:14 radhermit Exp $
 
-EAPI=4
+EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
@@ -16,7 +16,7 @@ IUSE="debug curl exif test xinerama"
 
 COMMON_DEPEND=">=media-libs/giblib-1.2.4
 	media-libs/imlib2
-	>=media-libs/libpng-1.2:0
+	>=media-libs/libpng-1.2:0=
 	x11-libs/libX11
 	curl? ( net-misc/curl )
 	exif? ( media-libs/libexif )
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-debug-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch
 }
 
 src_compile() {

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 5f4752e..1b0e8ff 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -5,6 +5,6 @@ AUX graphite2-fix_wrong_linker_opts.patch 760 SHA256 95c943e57043f7368c44e1cd5fb
 DIST graphite2-1.1.3.tgz 3680838 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7 SHA512 0e7c29f4a8421c937ee5255c0708a60fdb903272c3084d18185d4910e9b527751ed44d8d6ac3c64a13e3093ac51137ddc7b6f7beac60be5952fd473b750d21a6 WHIRLPOOL 995a4b0b1c040c95d0c2ca07c8c98d2673ba1d93d892f7166523cfdb8a502ff2214c38317107b849d7675f815c0b80fa0eb74588687a565fa1acd1726bf1059d
 DIST graphite2-1.2.0.tgz 4663935 SHA256 630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e SHA512 56b88e1665f4aa7316ec4b3975dd5aa24b4420bbb86991ade0130f28c082c9121f651a351cffa893f32b1fc28085315c7b7521a9976eacd066e34bc54febdd21 WHIRLPOOL 8a679b9455cafb5bd2ca6d460bca5ea004191e81d353e38c6712c364b2e0334581d59c578e956bdd3317af0ca3a1d8d62c0f676bb768fe37065e9c972e944901
 EBUILD graphite2-1.1.3.ebuild 1945 SHA256 de8820b272e702286edeb37cd07c18b087d09b0df82dcaa5d35b4421ede3ef8b SHA512 a9b27f37a894329dde64fe6704cb270b264fe70f8de81d0b8c3801889ff8210fe08122cd51bedf16f874f8509535de912275ddc6a73c905846f9de9cd2545a9e WHIRLPOOL 26808d387a986e245417e11f86f4a5d796b1480c2f62e72b66facd8b2f5ad2bdc99c75629caecf8e51ef86608a9c325ac523ed9fd4de5ce47b886aca2aec26b3
-EBUILD graphite2-1.2.0.ebuild 1895 SHA256 a694dcf494af127a267dc73acb6992432835913bccfdf881008e97af70f9cbc5 SHA512 8eae6de05732f91954efdadcbd582b3c4bafb47dd0f9201e39597499fd3dcb819fdf2e36dc987a8031a098389dda7b9d1873c5f76d502f89c179512ec1248c11 WHIRLPOOL 2c37e9718dff45d8293b2f53633142362aeb9b1c437b06be16b528b48818c2e886aa700de717676423806f5b1b2963b1e60d984823ef4a1f3c2a2c6fb19ab2eb
+EBUILD graphite2-1.2.0.ebuild 1899 SHA256 d10baad4e95665158bf96e5e58ff49fb5e255e362865ce3ce16ef4ed68dd6056 SHA512 d11b92f20896ab31faee9f80e768e3acfaf9dc3df8dd0a683ed7a1727df3a67641e4251f4ed37fc6c5889dc95d4883f2d46bbce80df18f5717bce3484bbd943d WHIRLPOOL 8a3a5c7520382887e1c9814d272babbe92d1cfa39204224dd707dcabe47a32e0d5596e0d6c807d442950ad97a5b24140f5d8fd1e5152bdb468fe913b3b1e590e
 MISC ChangeLog 6011 SHA256 8ef34f70ebe080f95d535deb4b05b7432bebe83f3144fb7b84cef380f6fbc200 SHA512 0b39f8e7218b59006b6543318e8c7b6eb7bf8ad863f96bc041fb3d243a4f40b0be19de87f9912761e16bbded4840277860bdd8f62d744a4c89342abdcca2c9d5 WHIRLPOOL c83efb6bb6e1aced1dfb2355fb1cb6e092b3c77fd663f4352eeec27b040f70a0f55296cb149f16f50ee01d0f41b60e57fdf1177018601d9330e1f6b42d19d994
 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8

diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
index 2430048..aacc972 100644
--- a/media-gfx/graphite2/graphite2-1.2.0.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.1 2012/09/25 13:56:58 scarabeus Exp $
 
-EAPI=4
+EAPI="5"
 
 PYTHON_DEPEND="test? 2"
 GENTOO_DEPEND_ON_PERL="no"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="perl test"
 
 RDEPEND="
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 "
 DEPEND="${RDEPEND}
 	perl? ( virtual/perl-Module-Build )

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 2567bde..b82b6d7 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -5,10 +5,10 @@ DIST libpng-1.5.10.tar.xz 702752 SHA256 dd49c39710a6ef8a550923ba17d3496b08ce769e
 DIST libpng-1.5.11-apng.patch.gz 10019 SHA256 13c4153607dbf401378de4d0ba31bff044acffde176503b3dc1b90eed20281b8 SHA512 53c579c73a44a148406b1d5b104729b49af0b559e2af045d4550b619a04f8bfdfa51750f256512ceee2059c6d11d87bda3beeb41e00cdc18259ea32372373959 WHIRLPOOL a0489b0e2be0aa5535c39d3dee540dfa4a8c9b558baa7c344dd3062409fa3c1575b21a659367a8298be2a6efa271f0c151e20587de9d4c6e932074daf170691d
 DIST libpng-1.5.11.tar.xz 705772 SHA256 42d562714f0b6b8ead5b0aabfd8bca35e44993a572e0eae3e772cc180e59dda8 SHA512 b2d7dba02f801112248fb3c361b134b852820ea4704c86bfb178687d503779a887eeeff060f1b42a3df1c2f2df433f072eb0d0ff086a191bd55957e1b48cc9b6 WHIRLPOOL eb6d989d5c6fbba720ebedd5649817a5cea394a571f419fca43851fec18fcbf2d9d0820d1a17fb161fbf3cc2ecfc30e3b2beb4fb83b16373c0b811322cd65fda
 DIST libpng-1.5.12.tar.xz 706348 SHA256 badc68caf528b4bdf9aa0ab29a1cef90570d17c69bba766fd0a9d41c7d48d40d SHA512 cece22d9772d1f6e8cfe54f276c409f8e5c1dad6ee08422872fb4e510177c44046bdd00346cf6fcb5f9b0b7ca5c7d59a7f24461d5a0856b00358f37049de629a WHIRLPOOL 8ed0bb41d7de65b4100aaebc5d21441fc7619984f5bea9e00cd033c1d6863250eef47b155944a31b0d8e3f6896ca2dcf3458d4e027526d530510f5d39a000504
-EBUILD libpng-1.2.49.ebuild 860 SHA256 d76072780902a441201f0f01bf09fcdd81a52a95331e6cfeb87b360b966c590a SHA512 991c647af21c696e8826d91a34e5f316331c4d2d661098a105d4e8dc08cd8fe0a7ab33b087488695244d6851046b03f2d963b3459ff72977754a042051a1e2a2 WHIRLPOOL 8e7144b91de571c5745e615a1b99ba1a2db9f75b424cd7e12ae355192137636a69fb4f7f4666a3275c8a8e1f11549f74af206c60117f784d6b1854d15f65e4b2
-EBUILD libpng-1.2.50.ebuild 871 SHA256 41152116f975c7b60202a5fe203704b5224b8847fa7a6d0e457e52d8791f0886 SHA512 3ac3c53b3961bbe41df431f09914d97e7af4f683fed4218808bcb37a2305dbc948710e7dc920ecf34e4b93d7111f028dac78b9b6c8a1dc720197a8fd62bfbc3a WHIRLPOOL 8b99df8af9d6d16b26190897e4043df7b7e85653c10355e7c4cfbacca548154b04153b6ecbaa63bf177435c79219f13cd7f05df63d630eac9ded01ecf5888587
-EBUILD libpng-1.5.10.ebuild 1583 SHA256 d583e03342544a96fcc68214bfc1520dd473ef4b8e0cc2ecab50c68039d2861a SHA512 28f33410b7c42b3baa31fd6533701e0f0838f995d0a7af0ef2e30a638677ac62882945b7fd555eae5411ae4dd6565592b24e886747a3b902b0b11e28a0b5fa95 WHIRLPOOL c6d7dc7c84b74a564ba227fdad7b88f3c0cf8e0f99759e38bcfb5c2583f79fd207c54407e422a9378d023e94679875fec873f20744af175c7ab3a4d309f9be2b
-EBUILD libpng-1.5.11.ebuild 1318 SHA256 3e95315493b0b2168183c8b8e8e52426fe628425f2efa2c7c0b37330f2a90ff6 SHA512 dafa596ded3fef64f38ad4fa7bb836cdd36db76e2588a68f2415c375947ac3d01a81a105f5208c40c3bce980361d2486e8a4deedf56edf0c8ac437bf96bd66fe WHIRLPOOL e7d67d6f1f29903bd25c9481047a7bf4a4f7ab2770f7208c34efcb20f3bc9d36f6002df5487805c5b308a96e92cbe14e0c773ae82a26b181950f7a4a4e29adda
-EBUILD libpng-1.5.12.ebuild 1329 SHA256 ce5e7e17df284dfdec0c9cbaf22928674d5a3e332c07951cd1e0ae66b78b332b SHA512 e91b7645042294aee1e8a3778a7618564a16eaebcdc234634494b0e5ff28b3196fc94034e30ad95374bff5fa7fecc2e6b68dccfcbb25e655ffc4f646c66295db WHIRLPOOL 83772afc89a4d588265ee309e452da8e0a2c4f2d39e6e924021b96cfd0b29153291d2738e05e1c4edb6ad875dcbc924565bc53d8e774fdd783b0e70eb4162f70
-MISC ChangeLog 48644 SHA256 45ebec4e862ac24f61a5418feaf73348694a99de6fbc478f19c02c491324b13d SHA512 9cf09d3d2d89cd9b3929205368e8fac79fc37c91767f4292a088dd3098c7f7ace25706b63ff51bde8c3d3b12543c0be34479b07a69c01b5b2a92592d2132c839 WHIRLPOOL af9bd9f30b11972df7c7243a07d8c311592865f22698c3bcca430fb24c49ffc0be822a6ca7d661bc9524c0046c8311a8a1035b5b12ac3cc36558636a8b6e9b0a
+EBUILD libpng-1.2.49.ebuild 858 SHA256 85a4c799ed65ff9b0d05ef20328185a31e251e77d3e2494cfaf0cd52718e9597 SHA512 308ea3e778eead480119cf316cfe2b7b2a7f7d6730a8897336b65ab9116f4f64eba7ad364bd44eef80ae5189b5bb95711425e6c87c26d8c15e5de3829f724080 WHIRLPOOL 9982a84f6a1a4b73243365877bbc31d2ba65558055d292af6ddfcc7db9d9190bafaf5cc16792e7545885a63f6346f1856e7be64cbaf973166dea15f9e6bf6bd0
+EBUILD libpng-1.2.50.ebuild 866 SHA256 18c6510796b4e757affc9b95caa0001e3349efc17ded8f2b9b8d475e0976262c SHA512 9c80b8a71c23da5f1001d63848013f9dfe51d3557cf3661bcae20e241f34f5cabd0dfe4eaf91f85e6291825df5baa544792a155ff9a491b14f751ee761103040 WHIRLPOOL 44bd77994e7df3318fb459fce3f7a8491a6d727c459bf49eaf5937aef1a3676250d71284205f83a1662de8dadd77dd23543bfce08b2f5c67507dd8f0984e2132
+EBUILD libpng-1.5.10.ebuild 1581 SHA256 f5f8452906637eca1199744d45ce3cdd9943598ec053c9a5358f1dab4f5997fe SHA512 88a378f5087e824884faa0b091d9f7e16a5b5a1b6886a70368ea169ecfef9ec48d0452fa20911c8b858949319f004e3b4bc2497b4ff02726151ca991d8f9843c WHIRLPOOL 88f9046721f94ac51efaabe8611015834abcb1f65fb4b4736b1fd072f436ea841a10b0963ed13af64c5adbc7a8fce2b1deee5984a71dcb8572bdff5f5e3d65c8
+EBUILD libpng-1.5.11.ebuild 1313 SHA256 5950958de06a4aeefaec7197e6839384d3f637a86087757981b968afa4b2dcb5 SHA512 511b08138bd278ecb8e7ad060e1c50825ec7e6605b0913f1339715c81714f99c609cd44fc73cebec239323ec5edb0b86f231a42e88a0921e952d405ba9c07c65 WHIRLPOOL 261b38a082388f1a1de711057b1076898268df9c582c765a5ff06c22b86df57411d5f9c6cf3183d4f73a48e959fe9f5ec868f6fb704ed8c7bf58ad67755fbcbe
+EBUILD libpng-1.5.12.ebuild 1324 SHA256 ef3e8498012ccf6e0a3a8cb1237280612901c92c3e6b91cd9a3953e0221f2c0d SHA512 e62070da42ff09f51e4945d5d465a7f9fc9d539a74c865a1de000ff4bad6cf380f75ed9052ece363a078095172ec0e5793e8aab702c1145420f8229a805ffb43 WHIRLPOOL 43078b0f7bc2713b48e8d84d9fb26b7359af714037ee27921cc8a04cd46e19cc9aa9d92a0121313775dd7e653e02c0fa5e50ff76eb26ae18cd519fca4a7d48ae
+MISC ChangeLog 48834 SHA256 75f4cfee5f0424fbcf06c357f6bf45c13461c1b97111696eb1eaf69946f69471 SHA512 f558dccebfb2d1dedcafa26e39c3b101d5bc340ca002bd606a88cb1a183bb70bbf619520d9f652e60b35f801c9e1287f9812f07988e048be2322199951ec2a18 WHIRLPOOL b3584a815a7a600423e9864981d7fd90706d416bd73b89b820f2d2af6d9ff9dc50e300587f20240763a641da7620f5bf0d76625810b04c8c55196da720bdfc40
 MISC metadata.xml 247 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 SHA512 f87239088300fd36fad8c64309774ec33c6ee0d0b2c8a43b8bfdd4a53223c4e3ad8bfe31f8e7ccfc12af7ab81cf54d2440070e26ad2ddf774be0b40f9218f05f WHIRLPOOL fd606eed56c413ebfb17ef83fcd32540f0a871febeb21e7f17b77d687d6556f75103f0036a3be2ca0251071e5cfaf0ec9d71b1c2a8c087f68ea50f15bef87eba

diff --git a/media-libs/libpng/libpng-1.2.49.ebuild b/media-libs/libpng/libpng-1.2.49.ebuild
index 0c7f3c5..6f9c093 100644
--- a/media-libs/libpng/libpng-1.2.49.ebuild
+++ b/media-libs/libpng/libpng-1.2.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.49.ebuild,v 1.4 2012/04/04 16:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.49.ebuild,v 1.5 2012/09/28 16:07:06 ulm Exp $
 
 # this ebuild is only for the libpng12.so.0 SONAME for ABI compat
 
@@ -12,7 +12,7 @@ DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/:="
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
-LICENSE="as-is"
+LICENSE="libpng"
 SLOT="1.2"
 KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""

diff --git a/media-libs/libpng/libpng-1.2.50.ebuild b/media-libs/libpng/libpng-1.2.50.ebuild
index 91c9d64..76a52e2 100644
--- a/media-libs/libpng/libpng-1.2.50.ebuild
+++ b/media-libs/libpng/libpng-1.2.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.50.ebuild,v 1.1 2012/07/13 12:45:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.50.ebuild,v 1.2 2012/09/28 16:07:06 ulm Exp $
 
 # this ebuild is only for the libpng12.so.0 SONAME for ABI compat
 
@@ -12,7 +12,7 @@ DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/:="
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
-LICENSE="as-is"
+LICENSE="libpng"
 SLOT="1.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""

diff --git a/media-libs/libpng/libpng-1.5.10.ebuild b/media-libs/libpng/libpng-1.5.10.ebuild
index 82e9577..ca71ed8 100644
--- a/media-libs/libpng/libpng-1.5.10.ebuild
+++ b/media-libs/libpng/libpng-1.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.9 2012/04/28 18:59:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.10 2012/09/28 16:07:06 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 	apng? ( mirror://sourceforge/${PN}-apng/${P}-apng.patch.gz )"
 
-LICENSE="as-is"
+LICENSE="libpng"
 SLOT="0/1.5"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"

diff --git a/media-libs/libpng/libpng-1.5.11.ebuild b/media-libs/libpng/libpng-1.5.11.ebuild
index 1376cb9..ed52d0a 100644
--- a/media-libs/libpng/libpng-1.5.11.ebuild
+++ b/media-libs/libpng/libpng-1.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.11.ebuild,v 1.1 2012/06/16 15:58:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.11.ebuild,v 1.2 2012/09/28 16:07:06 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 	apng? ( mirror://sourceforge/${PN}-apng/${P}-apng.patch.gz )"
 
-LICENSE="as-is"
+LICENSE="libpng"
 SLOT="0/1.5"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"

diff --git a/media-libs/libpng/libpng-1.5.12.ebuild b/media-libs/libpng/libpng-1.5.12.ebuild
index 2b98a21..f8db6e9 100644
--- a/media-libs/libpng/libpng-1.5.12.ebuild
+++ b/media-libs/libpng/libpng-1.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.12.ebuild,v 1.1 2012/07/13 12:45:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.12.ebuild,v 1.2 2012/09/28 16:07:06 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libpng.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 	apng? ( mirror://sourceforge/${PN}-apng/${PN}-1.5.11-apng.patch.gz )"
 
-LICENSE="as-is"
+LICENSE="libpng"
 SLOT="0/1.5"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"

diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
deleted file mode 100644
index b67070d..0000000
--- a/media-video/clive/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST clive-2.2.26.tar.gz 56268 SHA256 fea2437325017da8eb5e96b7dc57a57a95fe9ca2bfaeee924a5264f553628c26
-DIST clive-2.2.28.tar.gz 53525 SHA256 df153a71f43ccdb6170e26ba0c7fb307898d55fa9bd38277df25cc7b6d34a490
-DIST clive-2.2.6.tar.bz2 45285 SHA256 73f40b17a319a46969b791b9521120dcb12cea8a4bfcb26dbc68dbe174e57eba
-EBUILD clive-2.2.26.ebuild 1424 SHA256 4d2e992a9004cdffa46fb504df4e2575c502d9a793afcd7aefcaba4de74fac24 SHA512 5a588005feae1d758e9a84041637050ca0c90cbb3fcb0e20b41467bb4f9068ffb428ab60077b0fe8d60a153e9bf09088b6389a8f58f52959c5c6688d3970c8fe WHIRLPOOL 71ff9c262c5750cdacd06a75a9e7b2beacbbb7be11d03e9b91c2a19db2ac66ea9e88ea68fa3f00d65fdecb13bcef74ec0491a1d267c3a5cdb03ffd53929f4449
-EBUILD clive-2.2.28.ebuild 1424 SHA256 713e9b48054efdb09bc2989e01feccc02e15348f44b63098c85ba7a8c693cb70 SHA512 eee0d91a208e1fa23c04f846d2e3a9009e4adfde008663c3167352b7234f9355c041af259425ba0a4b66d2c8099134416a4bb7e05ce9210dfbd8ee430b1a8881 WHIRLPOOL d44dd2f6e19dfaf35e82d96b06c6ba30767b7d8e3ccf008603b0ef7afa924f837ba5d472e5453791eb88be087421a8eb37602cd4fb395df0d04e7c6544a67737
-EBUILD clive-2.2.6.ebuild 1355 SHA256 2943e47880db54decc6d7c202ed7190e192aa43bbc2541eab8d16cc07418b646 SHA512 b41ea0818edeaec6f37eeae7e3505e6e9f953fef912faec9a789390979bde984f3b68411dd1122ddb47b139dda54a3323d33839166d30f1397e70cdfc924a822 WHIRLPOOL bb4bf2fe5ac8f0b5e71d0f6ce2fdec4e407e2e4611670f93bb6c54b7f2b1838563a819eccdb76aa93a1221e236010d0361835ecc7a4a092de120cc02679393c1
-MISC ChangeLog 8928 SHA256 c184332f08312f23f74cd056cc4b285fd0e8c15b2f59c934c505f1d2e1a99e7e SHA512 fe912c90d39591d7f17610995c6ae455bb36234cf37ed06bd32ede4731061bf6be7393de5efda41c08056e6503b091c2bd182cf4d192644536795a7cac52c0ae WHIRLPOOL 624f7a530654ab351ef79337af406ee0afa1c675697afdfc6ab63d653a04d1e96dcec1885f458a6b26e5c833dc71b077cac37d844e4a192acf983ce219a79d40
-MISC metadata.xml 654 SHA256 779c13ebcd309b5128f2945f47a746f5d6dd313e104ce5bad71b14fb3463c0f9 SHA512 b7ad7411c7b41f71f31bd603a567d3870da12540617d86f4241fc55670463a0ca1a6b53545e9a35f3ecdaaf2c18472324cbe8f61ad3b2675be721006b0fcda45 WHIRLPOOL 1b8f17cda110d4e3ea20f87929184a7addb24b851c409412072560ea6026b998d28810a300f794bc7cd44d459d90e7e1dbdd44069ced594fa6c259b2eb28ef50

diff --git a/media-video/clive/clive-2.2.26.ebuild b/media-video/clive/clive-2.2.26.ebuild
deleted file mode 100644
index 0866950..0000000
--- a/media-video/clive/clive-2.2.26.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.26.ebuild,v 1.1 2011/08/17 06:33:10 radhermit Exp $
-
-EAPI="5"
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="clipboard pager password test"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	dev-perl/URI
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND="test? ( dev-perl/Test-Pod
-	${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}

diff --git a/media-video/clive/clive-2.2.28.ebuild b/media-video/clive/clive-2.2.28.ebuild
deleted file mode 100644
index 33998a5..0000000
--- a/media-video/clive/clive-2.2.28.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.28.ebuild,v 1.1 2011/10/24 04:39:52 radhermit Exp $
-
-EAPI="5"
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="clipboard pager password test"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	dev-perl/URI
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND="test? ( dev-perl/Test-Pod
-	${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}

diff --git a/media-video/clive/clive-2.2.6.ebuild b/media-video/clive/clive-2.2.6.ebuild
deleted file mode 100644
index 762c758..0000000
--- a/media-video/clive/clive-2.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.6.ebuild,v 1.6 2009/11/25 10:23:22 maekke Exp $
-
-EAPI=2
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="http://clive.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="clipboard pager password"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND=""
-
-SRC_TEST=do
-mydoc="TODO"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}

diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 35057b1..5b10c68 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -4,9 +4,9 @@ DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31 SHA512 c9b1eda3cfc6279a96864aad9a6096b36742460233f03d715b94437e8ffbb1086d006f379f8fb4d7e2b7598ce810e62b5f88151832b19d8459344079fa55fe67 WHIRLPOOL 15522e5bf9c2fdabc86c23122159b7f9ee855211eb4ae088f1ebff07bb8dcb4b763d61c49ba31ea18d3e3c237a60e685a23e4fac71bf94b1af80f84c638d9fd3
-DIST mplayer2-2.0_p20120828.tar.xz 1739048 SHA256 7a53079c52c73ce00df5c29e1e2c19f944365213c70107b4bf992cf32ca85093 SHA512 d8eebf9deb1f07f7178037c9e980bbd942f0c68937fb6f37aad9b4e25f6a4d2cc5b6f055537c7dca12adf198e6f2531197f2869fbd0ba301d5fc7f5294f82b97 WHIRLPOOL ca9055a631fc7d19329db3c45b297f497c44c5e82f621af5cc76e32b4fac8585690f8252156dd2fcd44bd150ad18778aaf2c2b5796ca53f32e4de81d85385135
+DIST mplayer2-2.0_p20120828.tar.xz 1739048 SHA256 7a53079c52c73ce00df5c29e1e2c19f944365213c70107b4bf992cf32ca85093
 EBUILD mplayer2-2.0_p20120309.ebuild 16420 SHA256 a53136abf0b5bb1f3a5256881514f73e628865b7233f61409d45728d9abef1c9 SHA512 c567bb8a38d99a302f7d8f25eb358fb8b2e2fdc6d438ca2b873d0279f0dae18d904ba105e272565861c943482ebb9f489e6d4e57203326c1bb57398cbfe4391a WHIRLPOOL 1dc2653d8604ef58443e8689cf7985346a655b1436beef1de19ae9c19314df6baa36df4b9bb49929f31af01c378760ca348fe1d3842c9664c911e247179d5c36
-EBUILD mplayer2-2.0_p20120828.ebuild 14351 SHA256 8fa68a13b4b847c6744804da93b3f5c0b540f23844d27f6da0bc3e9e36660771 SHA512 6ee971f9043b2dd27cd4c55ab8ce6b7269476dad4da021877ecf514df4d02651a99079f92be44a3a2d92bcbc5842902a499d68bff530ab212cbf3891ea56d698 WHIRLPOOL 327b1aa6317ae34c1c8fff866099867bdbd57dcbb569fc4acca8fd3eea05024df1a5f616f8d6aa95fa98d783902bac56649929afaff737fa3815b4f4891b27ac
-EBUILD mplayer2-9999.ebuild 14341 SHA256 0422b865d86d704b4873ed5985565fca4d4bed27dc84258127880f3f220d4501 SHA512 98e86b266b9ca82190962f2c5045a104828a178b64a29b56c5751002d00029ef3a5947839219c856d8df15e89df8954ca7794ea581c36b9070694522dff2c150 WHIRLPOOL c0a0caf1fe9b39dc91909cbeb6df857ce21ae7f3d5091926261e49b517b71c35f6a0116b48ea96541d6173af780774d14beabd75b825d6b505e821fd9c697399
-MISC ChangeLog 14236 SHA256 e02966f5de6862ebe5123b74df7e543d6ccfcd2c35d4ae84c2a1ea23f1a12d2f SHA512 41444ab8bef630c7e7b03c7aa09499d0239ed67673354667c8c84d573f12e483d380b239c2f45524bac7be93606763d076940b80679b61d77cd417a104c88b9e WHIRLPOOL 01f65f3235d1c10a978985eec1381522c00d93b643f52eabe272de9ccdcb1bd82772de18d36919760548a670da2de215431f6d0ec1c316411c9fe85b702e1615
+EBUILD mplayer2-2.0_p20120828.ebuild 14353 SHA256 d4f8a007fe72d534c7d4d8ef3672a79708f8d6e974a7dcdedcfb9f3434569afc SHA512 b4884a8d9979cb7dcf8c13a5d1b93f6c73bdb54866369584f47e66d870e166f4f2e1666027feaa1840a47d4d0b328042c23ff165eed8d1cd97c106a4842ebde3 WHIRLPOOL ae3e3fb1ba625ca0bddc8d27d93c67d258a934901a794abf63775f7f80683741033efd5ee0c46d5732551c6b2d323ac403d5c3f3e2f63fb480134dfcdcd44f46
+EBUILD mplayer2-9999.ebuild 14337 SHA256 d9bce25a8992cae4b41a4d13a9e5e669984fd011a91e77974d5218666d9f004d SHA512 3f0b75ed758fc19f51a45877ef9e2a2528f6d4316b9d113bf18b7287e9368f93a4e21ebfe827ba354624bd92bd54987d7d8de80b14ef91171ccae022d2538768 WHIRLPOOL 0a943ac58fe5ea1d623263e225159b901f27158b1b85c128c12861e8ba5ea966cae91d48d5786be698dc054fa1ac4e174b91f0cddbacd6f6baf60695cc66c9b9
+MISC ChangeLog 14395 SHA256 d1c7557a917d0e2730c7cea64185436c2f2262bbf6dead532abe99b7438f748b SHA512 ad6cbc2f65b6622263cdc52b207633b3780f2f88b49f8c3ae4562bc18f575de1b6f255e6a2c14e75294e757c86009bc3be0ea81cc46c60de18c3b9be5360ddee WHIRLPOOL b78693a18ad11a10d8579cd36b8d08bb5bbbded5aeafa281aae4bc5fe7515271c8395b4075e5c4472b220df2cdc5efe9d88293774d45d50fe572d2eb6a678ce0
 MISC metadata.xml 3398 SHA256 5625ac4ca580fbc61081e938371163b4de194d3d539ec0c63330eea9769bf895 SHA512 401fb1e9f9e967cf2d7606a9774b848564f768f96becba691a29f602cad3383c63e6b458d3515d76ddccddd648bda81fc095d807015e4ae4d48dbbe5a56763e9 WHIRLPOOL 6d72078d65e8f9e94567574071233f96c0289c499ba5dafb37c066ab89c2bf9b021aa8b33692367c0e61a0eda9852f05f178f9347a30c13a9cd24a2a7bc4b816

diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index 3b39962..5848748 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.2 2012/09/18 14:49:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.3 2012/09/27 23:02:48 sping Exp $
 
 EAPI="5"
 
@@ -153,7 +153,7 @@ RDEPEND+="
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-lang/python-2.6
+	>=dev-lang/python-2.7
 	sys-devel/gettext
 	X? (
 		x11-proto/videoproto

diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 3b6ac2e..c0c25d7 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.45 2012/09/03 16:33:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.46 2012/09/27 23:02:48 sping Exp $
 
 EAPI="5"
 
@@ -153,7 +153,7 @@ RDEPEND+="
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-lang/python-2.6
+	>=dev-lang/python-2.7
 	sys-devel/gettext
 	X? (
 		x11-proto/videoproto

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index cdd8b89..41ae78f 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -16,6 +16,6 @@ DIST nxproxy-3.5.0-1.tar.gz 80194 SHA256 8aa59727dfcd914d73447992120e100c20d17df
 EBUILD nx-3.5.0-r1.ebuild 3380 SHA256 8ffcfffa5b5da8e5667f7b022a6b3e68ad8a637e44a0bdeebe443023cf6aafe8 SHA512 ba4153876c46ab6ba5c6d08bdfd2f947c712018217563926adb9ad797290cd6b5744d055173e747402e153e73491c866c8fed66a10917968eb72d6063b9e9913 WHIRLPOOL 21216421f3348acf809b4209ee5c6e023212936fc9c31e7d2bac2df8e68f4dcbbc19af748fd055274cc7ad254182f358b7b88f4618ca3a765edfe0968bc3be19
 EBUILD nx-3.5.0-r3.ebuild 3380 SHA256 5145b195eb38aa225ab9757400d0a4f59f198db7c9caae1886eb6e04b0ce9753 SHA512 41d6acc25784df46c224dd2c8493732fbf37d693caeea4bf1c0501b0f24ccc3d379bf705b3d7f104bf595e6c9d789eb8b96b45e5e1577efd05e607905f69f53f WHIRLPOOL a34125195464e97378439b1ac31ab3202f2451f183688be5b1d66e58771d4b2e1192cb9ece6ed20ae78ad380c0666885a311e293b95323c571e5ef970a5f1040
 EBUILD nx-3.5.0.14-r1.ebuild 2587 SHA256 64a090f387bf415000499887390d970176b214c27085a185a0c6f09572e769e3 SHA512 ab23455b9bd52629edf7afeb45bfd3a2d86d881a00c9db714d3d7f20a56cd2ccd955c6c28e6b7d662fa209b3cdcce95097623b2d06945454e8b4d00e1138a47f WHIRLPOOL 834b05075aa153bd2742f92214ce87af3c4915d58369d98791af6a102e602f04d72b8d3a7c7998b1efa12d209005f2a56a0f9d14393f95700632fa78684bb009
-EBUILD nx-3.5.0.15.ebuild 2580 SHA256 59816a65dace25c6dbc0c15dcd79c4b72a5fb4a998d4d2694b78190b2c4bad08 SHA512 09530e511b836bf747a0932e45cf3da3c307318f087c64f67125ce771e751c950e706c5120b2ba81ba9016fe1871b88793a6ca873b7a26db7f6fe851dacc31de WHIRLPOOL a1959837ac8c384897ad2c48820d3179198a1e013aeaeb911b7a5bbc006a2bebc3be7de3fc628b16f9ac8f7bc218df0006cc7dab03c5f3be098a5de38ca3bfac
+EBUILD nx-3.5.0.15.ebuild 2584 SHA256 82a7fcd0ed5b4d6701d4ce8ce165a0c7b4849b87ebc408ad517ad9f7e964d15f SHA512 5153967caae1b8046764958c7e9dd03a709de498bc7e21480380d549413688e5506eeacaaee37417960a8bdf866fd93df862457db91f7862a362117e0fecd7ce WHIRLPOOL 3b4473e0d53713b170bbc9bf379dfd7d2f9b2d0d5d80db6360a1102da90fb6530a52f70201f9a8d80defe2f29aacfeb61b9f84f5090ce710b2e83d817c7d3f74
 MISC ChangeLog 10934 SHA256 d6cb7a6f00a299910dc376c2d04e1e2fe3924970d40fb527664a7d503abce738 SHA512 3da962417972c3be5dbc97d46ba1c1b0b5c16d376b144581dff6615e0eaeec5fe8eed3262e7a880e06ab2b7270b367cd652fb792ff4f49dba6c8c488a9aceecf WHIRLPOOL 2ee58d623eb1d4482bdb510d75b6924bf13eddb7a81fffab6e7e745fb09e72bce1ce24e9ea1ff42e25f0ac01fb214f842cfbc0001bd9032e062539dc8144e984
 MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec

diff --git a/net-misc/nx/nx-3.5.0.15.ebuild b/net-misc/nx/nx-3.5.0.15.ebuild
index 411e774..c64ab40 100644
--- a/net-misc/nx/nx-3.5.0.15.ebuild
+++ b/net-misc/nx/nx-3.5.0.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.15.ebuild,v 1.1 2012/09/25 14:11:17 voyageur Exp $
 
-EAPI=4
+EAPI="5"
 inherit autotools eutils multilib
 
 DESCRIPTION="NX compression technology core libraries"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="elibc_glibc"
 
 RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
-	>=media-libs/libpng-1.2.8
+	>=media-libs/libpng-1.2.8:=
 	>=sys-libs/zlib-1.2.3
 	virtual/jpeg"
 

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index e8f4e6b..cef8a95 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -4,7 +4,7 @@ DIST youtube-viewer-3.0.0_p20120820.tar.xz 25872 SHA256 5931f8b6159793d8f9780d8e
 DIST youtube-viewer-3.0.1_p20120924.tar.xz 86748 SHA256 ed02d328c3cf728a94f7f0b3d6eddedee3b2139ebd0b4667d4ea1173b2aa0025 SHA512 5a5a18651f2cfd2adbb903443e12223df42fdf99b2eedbf32d88c3685a8580b93c9dbbc149d392e979ec044bd9aea431704047d48e525ab97e8f3c289faf8968 WHIRLPOOL 787ce8fa6a25e154d80c3983ee0df329ae163ad4439cd2c8e3026148cffafdbc086c5748674e98d69834d7f4c78dd98c83dad8eadd9c1cf419ea58ad5b3c5516
 EBUILD youtube-viewer-2.5.9.ebuild 663 SHA256 1bf3d4b560d5d14810a57fddc6ce6ab61494b452997229168d5c90834c8a979e SHA512 831801f5a815db9e2a4cbd3d3f9a267ecf466c63c7abc6695fc2d27ef13515255dee7fa0cf73ed9bc64e2c262f5b4228080db92de493d05bcca09b81b4706ab9 WHIRLPOOL c1f10ebed2079106cc71e81f6cfd9b1ab2b75494d7e9dbff6b3dc39e59908dbf5af8f9abe186f7e79c6e97881b984a4d588ad1659a76f1474d557447ba815dbb
 EBUILD youtube-viewer-3.0.0_p20120820.ebuild 1106 SHA256 b51ec77f98886392911260621197002493e14c87c95ee706b8a46879f46b8384 SHA512 f1cad2e53de2d38f4132d27c2e72b856a135ad9bb54c67af7826fb7966a03e288124ab1ec4f701d0c70f8c2f74c42418d31ca4332ffe19103727449f96fb46fb WHIRLPOOL 5efb37a5c213b1b1d0ea20bcc686d053ecf3d02384341d503ac190363078eceecdf076c1a56aafc03db891a96c75a777e00709fec98990f71c526eeb532d51a1
-EBUILD youtube-viewer-3.0.1_p20120924.ebuild 1581 SHA256 6422f4303d8143ae3bb6f5b09c2600bb43c1e251727690fafe4b4a40961e475c SHA512 4a80e32a4d60265d8e2fd99f643b0307b866e87c6cd040c0e70d5670b4f1eeb790078ad1c2b88e4841259115d2a57ef28ceadb76ed61e2543d903a5c65cc85c7 WHIRLPOOL 0b67d44f5a0df6a7c4765bdde53a09bab85da6fae8fa4e5eee1ea4d97341723ce9234d332ad558f76dc91decc17e2406c4a7e89227cfc2d403eb0afc04841713
+EBUILD youtube-viewer-3.0.1_p20120924.ebuild 1583 SHA256 b516122e633ef1b1e1e00a2175ebb2ea36a58fd77d499114d3cbac5fc2e5c107 SHA512 bbdb6fab64fa65f88f13209bacdfc4ec6119eb78314d85ef5d8be03b1c2aed93515fc4f8084147e7ae18e9e57126b0918aab70dd4e42713a57253208214bfa33 WHIRLPOOL 3442726e3b9a62f755537f590a367dcfc98518e1615c9810908c719ed689892c26761415c59eb80c6e133e9e89da27963126ece50f227c3470747efde33cd870
 EBUILD youtube-viewer-9999.ebuild 1148 SHA256 66ad56124e07659262427845672422ed8f596d57277066be8f21084e546b1bdb SHA512 e653af9ca4e1b2ede7cbadcab6464f2c92094ad3b44ef66a244ee629d0ad9c5dc0f6420a6a2f233bcc12370cd45e86c2f57b431d577d247c2b193ff69929a88b WHIRLPOOL c90b12fc03ee009fad9fba458f6d9a9796d94e061046e6a5c0f787d251820d45042b805df85e9a7f36559c94a0e4241e72e58f05e95e346b0bbd4040f3dbd54f
 MISC ChangeLog 1984 SHA256 e13045f2004a8f766c511fce9b2af479bc2b54061f499118caaa0267a231d312 SHA512 fec928bb4fc204a1a6f5867809336d20e4316294d1fdfdbb93b9b7802f2db5f4a5da0eaa806126c62bd0fb9853c553891ea5cb3c6318dd345d83f726c9f22e3c WHIRLPOOL f11bdab30f775e3629f666e80f9f23b716a3c740de45bf49060ca2731e7e3400b3c6cf6b8034433f25a46f100a1a48e975278b9ac0fc0940bc88332d675242df
 MISC metadata.xml 708 SHA256 7bed4577f83f9c1a55a170f5d2e55fb04d86484c95f4a6924536d1b0c7f3e714 SHA512 6bb45dbc64c4572aed09dda27ed559c2565f662a29af6d27226dd9245d52d03ae56bde09fad2cbc35ef2d54cf6cd1e632e467b93df5750c5ce0b3849425470d0 WHIRLPOOL a698abc1877258c64d429e5acc858c99ca0069c70b3171d346c4aada1d3ee1bd93d58f0747b858a70cf4bf5311e7950f7cdd94fb8aeac4cda37872e7b21efd40

diff --git a/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild
index a2b3b13..43f300a 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild,v 1.1 2012/09/24 23:39:29 hasufell Exp $
 
-EAPI=4
+EAPI="5"
 
 inherit eutils perl-module
 

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 15334d2..9b04aae 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -50,7 +50,7 @@ EBUILD nvidia-drivers-302.17-r1.ebuild 18698 SHA256 35904addec73863f63bb8fc43c5a
 EBUILD nvidia-drivers-304.37-r1.ebuild 12467 SHA256 e35ba319043fa69f7bcbd5bf999b14ecf0e7922ec43e7228bfe08c617bb69947 SHA512 9f64eb011abbe62915a05e09aa2631154468951b66cc703754ec68c1b074fb1f918bca73c608c3394f43bd9e7543856f4d5b643ae301d3a22b69b6565d2239e9 WHIRLPOOL 710c8e55578dd2cb61047752acc3192529954a1e0ece98ea01b0bd2f3a776ea0497f2b814a9c3dfb60874e20df090b64b2135ae4342d28fcafc4ccf813d6f175
 EBUILD nvidia-drivers-304.43.ebuild 12759 SHA256 e6d36303347c44a1ffe2ab7503e0f583c4831d4198b01a021b6a156360b21b88 SHA512 a66c30fa34336eae132864cff076e010cc7bcc9381b942ea069ef5eeb7c7d4c0e65653097fb85044e9e25c29b4572e8c36021a00df3b681db44c85b2d50832f2 WHIRLPOOL e0ae300756146b3e6d6766fe4f890f42e2ef19b614e5c29e67543c362f9cffe099bd5eaef76f7c4d1e4755933b32c17b791771cc0cf0f1eabb3222e4dfe446c7
 EBUILD nvidia-drivers-304.48.ebuild 12814 SHA256 3aa6478d61d2f68176720945c7dec2921090d5601090f584718f135f065c43c8 SHA512 10cb91743d1b5ee2abd0d96f4ca05aa0a1ef67bb989db39bd09d311531c44dfe7e00a91c193ea1414ddb431ecce1e5a0017bfdda5325a5223c8a460efc683025 WHIRLPOOL 65bd95063713be6155bc08a5d7abcffd54cd4e816fc6e78f3aeaa135a15e86b00747d571573ea2b4dc19270e57e11004319001f0a4858a3b356631b059dc8223
-EBUILD nvidia-drivers-304.51.ebuild 12808 SHA256 26cd467b0002c42f0ed5be5ae52ecee2a3324e082fbaab997509debb1a818f76 SHA512 e7a6a31a61430bd39d236b8898e93e03569db891be61a4755af659ed2e9dbc58f4bfe6fd62e96a472df1672ee15187d1ff13ed50940d9334912af0349f67043d WHIRLPOOL a2666bee4110771cf78fb037e996cf3d12974571c89e6a02150c6b8d722af0653114636e5d5df4614870818592c34af61286e8227f4a625863fb77fdd371d6ae
+EBUILD nvidia-drivers-304.51.ebuild 12812 SHA256 e366a0907fb838013ec9d0da8a6607b29d0aeac3d30319aef32f44674eddded0 SHA512 1d7aa4510e9c7792ff5a79fa83b0c11772e9997618117dd549f62b415d65c1953b650e27801960d0282e45946e967096463b8a176c2985ba0229485edc023e46 WHIRLPOOL f4b6d45cd8c7a2f2fecf95a2d29bcefa2fd14cea70042efb032aa1d022eab472173dc9f7072860ce15fb2c2fc1f4179565d020297295d3a6efacaa7ba923f50b
 EBUILD nvidia-drivers-96.43.20.ebuild 15283 SHA256 dc5391522b493ae6fd04526f41ef1d78cc43d4bc063f06a2f9f04fa6f996bf16 SHA512 f5c198dcadc904d8e96f0071dbf1449a418b147b132b697b110fa9b313cb6678e8c3a3b496c8654655b9f3eb03360742a11b5b689062c4b653baa750d670e21f WHIRLPOOL 0224ba1195f9a231036b8f74bc291776d4eda966f82b7eb7a5f81744d989494d26b8e86ac83e866104bf847f3fded537dd386c9b11f897af3d92ee37881eaa0b
 MISC ChangeLog 84533 SHA256 cb1ec733b7202ac4e1251868b5d06b5f5b74a8c583b9e59461b0b2754add2e98 SHA512 b82f3a883f7bfc607edf82d4375a0fc542944973acfbc509bb62eff7ec9f2a89de923713941137919ab469bca140303753eaca6f7e66744b5155c4d705bbab07 WHIRLPOOL 2f84b2517d82c9aec70a279f8e81e64bebbb2c9909d1200533f9c4a8c452bfac82356d19500c4c58f020488901d943856f0ed8643e6ad23fe1b27647a7b5c56e
 MISC metadata.xml 937 SHA256 807dcc6ae2775af89d15e2253a264ea0d24803bd876f93519d9dfa46abcd8c80 SHA512 85a7324e9a065c9bd003e1f9067adf5ad5408cabd5e37480422066fef392da841622aa6049aba0fabe249cc7e5014d4cb8435e4ad8507645802fad48f2021af9 WHIRLPOOL e87f8890be0329cffefc58b491cde96920344b0cfec5b04589dfd49f3805250c6ff7ecff2e8709fc930b7b77a32ff65ca530596ea521aaf9e97b6f82ccbc6e01

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild
index c7943b0..4847e4a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild,v 1.1 2012/09/25 16:47:34 cardoe Exp $
 
-EAPI=4
+EAPI="5"
 
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
 	portability toolchain-funcs unpacker user versionator
@@ -30,7 +30,7 @@ COMMON="app-admin/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	X? (
-		<x11-base/xorg-server-1.13.99
+		<x11-base/xorg-server-1.13.99:=
 		>=app-admin/eselect-opengl-1.0.9
 	)"
 DEPEND="${COMMON}

diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 7efbc48..3037341 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -2,9 +2,11 @@ DIST xf86-video-mga-1.4.13.tar.bz2 423134 SHA256 b657bd5fec4aade6396c683886739b7
 DIST xf86-video-mga-1.5.0.tar.bz2 431769 SHA256 ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e
 DIST xf86-video-mga-1.6.0.tar.bz2 448824 SHA256 f0894fd8ddb1984d9212880544b7a7c30294e374df52bcce0c2acc93d434ce15 SHA512 e4388c9f85b34525e35b10a4912ece11657fb458b1e8330244df7f6ebc06cd2fd684b690cd8f712359c48b41a4790c85148d46eb206c5245d09e21ab62862569 WHIRLPOOL 183ca7620b5ab4c6a2aac51d8171a3f590f7e61a1331d7f01c96178ec73ce26a2c23b5507d1eda3c40d83d868bb7d650acfedde472c9ace4c74c4748d28362f0
 DIST xf86-video-mga-1.6.1.tar.bz2 446495 SHA256 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4 SHA512 e81e2f2e98ff7d0c39e396b432310711665536c7be563909c5ef6a4ae18dc0c8ab44a97454c775c459274eaa6341a35ace8fb7ad8113393f2e171d8d4e0a4d90 WHIRLPOOL c65fb51dc736c62b1d21b6b8998e1fe9dc1f918932c93613b34ec08a998f37c6edb805c670000a7b14bc56cdfa6b668d6f31aa456ed9b7b724fe5ea5daa0e880
+DIST xf86-video-mga-1.6.2.tar.bz2 446851 SHA256 3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c SHA512 2c971f8d3fc3d12878eb3ff43d904a56894f04dfde28e91af7668879e82d87c6d9d1bd19cedcf2c9cfe39495fd3f44311a768c6402a7b853967c63222c28e4e7 WHIRLPOOL d28591de3e06057925278b5723d0c062220ca6ccb22f793e014386bbb3ecd06eb70daed1b131a64da58b7a8a059fe4103abe89fd1c35c787e0b88fdc471ee8a1
 EBUILD xf86-video-mga-1.4.13.ebuild 698 SHA256 c6d6a5f417027f38250b71fbab958f44d7cfaab501ed5aa621bba126be417dda SHA512 902f3e62307f00048cf4cde2dcca480c9d02b8f08fd2900523b7b7ad7a183bb67350a1835264e088a80864040c0c71f622e70c41c368e34fc5dcbcc23d94d78f WHIRLPOOL e3f8506db0dce635d4fc78b1d9af2b22ebb246363661e3ac1cad069d8d80f56d789a37cbb93eeee1d5f84ee9d9e01771f1623d8ce53e92dc5b411e967c4d5b98
 EBUILD xf86-video-mga-1.5.0.ebuild 519 SHA256 fa70589c72b0349cb74e93463342620d798f54f14fbc1b2ec664c04b1fe65229 SHA512 1f8b4be1dd0e347360dfa636fb10c32e49b48f89e520e887825aa290ae5b324c291bde37efc9260a2e4488de703a51f7b42aaee8df5ae1fc889c80a55fb3cd47 WHIRLPOOL f9733676b0ead036b848006bd13aa7cf72ecf043c8e5bdc7f49a2e0d702957ed7074002546fa591587a256459f54f1ef9e39ee08cf9e7d63edacd07d7e1fa444
 EBUILD xf86-video-mga-1.6.0.ebuild 531 SHA256 e6f1b673a1ffb90a7a12e2d8a4d6bfd63baba2f437fe77858a0b21b88ead7c71 SHA512 8aa65ce328b999344505f704d7881ae02689428b4e08a7bfa82129bad9c6aa77686b042d514b460db1beb14250cfe4545655e24eaa79dc426b900f071ce03333 WHIRLPOOL 061258e8bc6e262a5da6d25dadb9e037ec3033774d5edd0cd1dd181f1be401fa48441cbc8df5b70a5a72e5e49f39ebb0be94578f7539e6fbd7925d83b90bb0e0
 EBUILD xf86-video-mga-1.6.1.ebuild 531 SHA256 065822434146fa53379eb9879ee235006e7481c2b699e4976bf80418281ddd1a SHA512 101d9aedb95eee2050a7b8aebba680367418c8b65e9c3d439eb2d0ec2b712fe10a4a66d0233dbe30126a4bb01b884206152521ee8a5135cb9b8b10fc64ffaa9b WHIRLPOOL f28add0af5d3019f276edc7401504d8c14bd74eed6542bb2a66e5ccbc132a3ae01d199b86158c979e4c3dfdfc9c2cb96894fdc3a991add348dd4db7f5c045f42
-MISC ChangeLog 15262 SHA256 7a85a7e8392a282ad549e72c5dced5fb231399b72587f9258cefd007105265f3 SHA512 4b506a35b77c9ef76ffca7b4d4b63d83a2f341653941e46c61cd8dd95de2c5f99c7216233114812ee3fa20b5f70a2665ff90e2bdcd9bf67bfe08a45a689582fc WHIRLPOOL cdb58229ffacb5a7483a8610641730b83246650f9ffa89cd74476fcc9e3b60e01fa5fb76c20647c024c4cd1e15a7365ee4a060a792532687786d76d6508db93b
+EBUILD xf86-video-mga-1.6.2.ebuild 531 SHA256 e287cd9d32e0d71b309fdb13b23af495951f6f66923ca4d70b4a180b4646aee1 SHA512 c46376357d455d6d2371399c47989d100914537fc6a7b6617845c9798ee25d36f02e8be0e5aab230a4312606ff5813967cd1ceab99ec89043ee52ef08b8f9fa3 WHIRLPOOL 5d920abba942cdce8aa1f4cda04c7d64a693bf8c64f05086b6a7536f23be5b58d2a0cc143ae684796af9cf526b8761c0d0a9992d56d0d1d02699a3e168ea6aef
+MISC ChangeLog 15417 SHA256 09b36173c2010ae5b852cb1817785bc74e98a43310731bb77d1f781ae546ea93 SHA512 3a6f76ec244c18d07667b6a35a3550d98494345d5d9c87a36903aaaf16b521dd890a0cd6d424f9a63d66ef72b3197fbe95eb73dc359f7bd9da03db71e4eda55a WHIRLPOOL 294ce668ab5551296ac2b8638209bdea9113e44e5fa46a4db02f086d5f20ba84b106954fbae762f37e737e2f22b90c664158363db4a35d55cd79a4b74621dd22
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93

diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild
new file mode 100644
index 0000000..f33a231
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild,v 1.1 2012/09/28 11:02:35 chithanh Exp $
+
+EAPI="5"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="Matrox video driver"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND="<x11-base/xorg-server-1.12.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index c0dc7da..fc1727f 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -2,9 +2,11 @@ DIST xf86-video-r128-6.8.1.tar.bz2 418251 SHA256 517e21cc83850b903549d698c9daeb6
 DIST xf86-video-r128-6.8.2.tar.bz2 469957 SHA256 7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1
 DIST xf86-video-r128-6.8.3.tar.bz2 454175 SHA256 855e8cf72c3a7704e12f331fe8a4b354518753c6ff3aa61ed156cf6e7530f02b SHA512 a6daea33b557f05911e94973d053a559b8c9171a4500778414bd1aed1188b17bc1d0f62bbea7b954e4ad2f42baa7bccbf51b6093ef11d2c61856e35c63c78683 WHIRLPOOL 2416cb4180153d716c8960dad80ce715c7c510246d421b25d6632e773bd6232b55337c39412da28d97f76529d6c5228153e09ff8bc5f8272d49c5d431df49df6
 DIST xf86-video-r128-6.8.4.tar.bz2 459364 SHA256 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7 SHA512 9393b036826b8142a751d805914d9f336e67c841eeb0bc4a647d20f0eb46f578f91ddc9854f93b3dcae629b7c22b888292b8b99e036831d99604bd0edc05b557 WHIRLPOOL 5671b4a686d3716e94f2836d9f9a5f3d0019a4636c3d20820fc28386a727c54a100af2d2c5363df27c27fca8ff2570f051159df0f63826912b5c69db21027a0d
+DIST xf86-video-r128-6.9.1.tar.bz2 470750 SHA256 8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c SHA512 a1a4f171c3d6ecd935a485dfeacdc6c595f287b0227c2bd604a884295aef6e7eab92d5da8b9d2682f2c676d49bcabf92cb0a4f35c65494a580582ef9dd76f73e WHIRLPOOL 77d1f7381bb061ff8d665436b7cb7ada8f51ecff23c0946a0a27e77d5b0b725b19fbb0a61d03e56421644786402ec1ce2aafd6453ac95a6750497dd385e70113
 EBUILD xf86-video-r128-6.8.1.ebuild 811 SHA256 46934f9cb094989bf9f78d9374781be0f75e21ec9169194f39dbadda3aee2a38 SHA512 d9d14fe2ac2e8010eae08583ea7912bd4dfab14c56d6e3c5bb727d849296b316d9123262fc99132fb57adc49ac9bfc47d2ba12e476cb1329ecbee0b6dc64d302 WHIRLPOOL baa19948605a0efe678afd91fe929e78336722aabed727d9392739d230e243179bb2dcdeefdb1051431be9444c27499985b91b9e1c9ce35f57e0fb5b2c7db013
 EBUILD xf86-video-r128-6.8.2-r1.ebuild 526 SHA256 64d61fa8807dc40124279fab71fcbfec2a55502f8db2d2d68501c5575c2d28d5 SHA512 aa9e1e450da8b322f962401e08e9d2f827c400172b4ec7da686b6a890739a8b049ea981f60f60036cc302575503b927f0d554a16d4c8f4fecb1a8e2861038202 WHIRLPOOL 4ebc911abdd7b175c46692e88b1a815e248c9e124201452719b0b2b29d74c0c3a53effdefd4b4e87abd54db3dea031232490fba1b4beac25e2febfda5abe60b1
 EBUILD xf86-video-r128-6.8.3.ebuild 531 SHA256 a8613a0a11d2613d892b8e7e7069d101618782ad3e34d05c47b2090aed4c09ea SHA512 832e14a169a574fed6b27c7007e5e103fceda05877e62115f23acadb3e07849e5cd124d1d3b266490f92a49d2d95f66a5082f010caec74f2ae69d4075682c492 WHIRLPOOL abe8210ebd3d62a4ef4d208ab3b2dbdc97f4a92754dae629523661d385806aa86e991cf65bbc3227038580a17b6e5a1f3c7c346caef7717dd2c380a2e30eed9c
 EBUILD xf86-video-r128-6.8.4.ebuild 531 SHA256 5283eac27d46e197a827d351c4335aa88d528c54cb401942529fbd4d94323feb SHA512 fc2f055a29055b493b2ea38d1d0b43b013595e3932680350770f97909c777d7ab3207c24c205356707cb7752d099c89975d1ef9a400a46b0b8961fa77c73465b WHIRLPOOL 0de97a03f43a20c5e00719fd339eb0e15970114598aca1b036faa15de39875e933c1e76f94b5952be7eb0402467788c8472cee1f8351b31ffcc3108620fe20d7
-MISC ChangeLog 4278 SHA256 684669ff1a228f688434c7640e425e235cdd837eab6d94f723b29d4eabcc8e5f SHA512 eebe5ee4b5b5f9fb5abf15e4139f669b5547a65dca96fa4a7b1d2a86ba5bdbc22d536e82f6583fc92f9743cf9f3ed88cf18168e38976dd03caaefbaf81b87edd WHIRLPOOL 71d9fa9b6d8f8c10f55b034f07ad03e6ef60e3513472c0ff8e60e2e2041eaa5240e7a3c602a4f7101e39e3dfe2eebd3ca7abd3333d122b3b45fd5c2d46e6ab16
+EBUILD xf86-video-r128-6.9.1.ebuild 531 SHA256 f6ce2c9e5964edddf5d81c24d4a7404ad0f43ffb13ee3ba1af219f9725b01bab SHA512 930a1b0bfc83619b411f736044e16875a2e87598abc63bc9f4ebeb7167e80cf96ea77af9c6fad83a2027fb45f4cedb0500da889f417bafeb3762477cc89e6013 WHIRLPOOL 427b5906f71776cc6d799d404612055870916cd5b825fa7dc8fb8a0d903951723bdcc2edfdb5d371e6e49ba8b6657da68291a7cd0c3fab29e7a114418d4e6940
+MISC ChangeLog 4436 SHA256 92773ad5972d797cca65e2bf56f205cca6bacf427176282d75b33d4302352c4a SHA512 6b109612a4c2e83a088a9394943b37efdcad0a014c833a758c92320ff8df3b75f5feeba30a710fdc19d4a1898686647ebbb7819e280f2c5c6dfd38971a3cc81c WHIRLPOOL 8127370c09af852e44bd412fabb59f0a531fbe65e27f2f33e1ae8bae4ea5df1ce245a062bb76b8bc66c218d8e0736d78241048da957c3ee3923fc7d6a530b858
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93

diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild
new file mode 100644
index 0000000..ab9b0fc
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild,v 1.1 2012/09/28 11:04:30 chithanh Exp $
+
+EAPI="5"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="ATI Rage128 video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}