Repoman QA audit, fix all issues not related to profiles or metadata.

29 files changed, 118 insertions, 114 deletions

diff --git a/app-emulation/cbmbasic/Manifest b/app-emulation/cbmbasic/Manifest
index 5ef951c..cdb27d5 100644
--- a/app-emulation/cbmbasic/Manifest
+++ b/app-emulation/cbmbasic/Manifest
@@ -1,2 +1,2 @@
 DIST cbmbasic.zip 387558 RMD160 34dc488631cf171d9953f3ae767c047d3f861f66 SHA1 2872133be235e48ed512cd619e6c2034350ef86a SHA256 cd0362a14c5f806404c67bac73f133e8845aa878ac4ea6ea91d340e50063396b
-EBUILD cbmbasic-0.ebuild 483 RMD160 56b9bfd0ef303ffa2f728801701001f9498b3131 SHA1 e4291e5a0775d6560d7ac6a8ab8abe069375e32c SHA256 fcdafe1d3b98fcb31b509f9c471ebebafcf00f46d73d554f6d3b1ae03d80e8b0
+EBUILD cbmbasic-0.ebuild 476 RMD160 005adeebe9c9f31bbfac0d4728080a1c33413356 SHA1 0004630b2c19bac32e6ce663612e891d3b46ce3d SHA256 5dfbb52bbf5108427346b3fd1d48a7777a1f6c7c16e89512265edb49f820abc6
diff --git a/app-emulation/cbmbasic/cbmbasic-0.ebuild b/app-emulation/cbmbasic/cbmbasic-0.ebuild
index 4dec48a..77dd892 100644
--- a/app-emulation/cbmbasic/cbmbasic-0.ebuild
+++ b/app-emulation/cbmbasic/cbmbasic-0.ebuild
@@ -8,9 +8,9 @@ DESCRIPTION="cbmbasic - Commodore BASIC V2 as a scripting language"
 HOMEPAGE="http://www.pagetable.com/?p=48"
 SRC_URI="http://www.weihenstephan.org/~michaste/pagetable/recompiler/cbmbasic.zip"
 
-LICENSE="GPL-COMPATIBLE"
+LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 sparc"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/fuzzpy/Manifest b/dev-python/fuzzpy/Manifest
index 6b19ff0..07422e6 100644
--- a/dev-python/fuzzpy/Manifest
+++ b/dev-python/fuzzpy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzpy-0.4.0.tar.bz2 28605 RMD160 81700a4c7142f20eae05b376c8ab776d6edfc52a SHA1 b87fbbc7211ae47b27597a5db1cda805ac395568 SHA256 a7519b5d0b101c1c3eaaa7f48911301baf0fd034dd14c6374e5c95f6b8cdc2d4
-EBUILD fuzzpy-0.4.0.ebuild 778 RMD160 5ff9170bb27416ba6ec181096c38677de02a45ba SHA1 0b5304c8e225fed8b5497fc01da6591220ff3d0e SHA256 23a1561ed404a750ee198ed1a17bd0329657dfce90ed35142b3accea9389ec48
-EBUILD fuzzpy-9999.ebuild 794 RMD160 08963bf6a9493d615110d80d51a1d16b6f85c681 SHA1 daaec9adf0fa9c0bbe58cdb9ac4c0ee9f1f20b7b SHA256 2ef9e60244ba98852a6239e32adc30ef0dcf770b6bb78fe13afdd176c8fe9fb7
+EBUILD fuzzpy-0.4.0.ebuild 730 RMD160 864fa5e334c07af6dcc0d1df5633f40b79a9d71e SHA1 7ee4a9aeb5216a66b7ab0253a13700da721dc82e SHA256 9ddbfce093faa0f4adf59bf39675f2634f4d8bd6a3f4de61cb3da694a3a4ff58
+EBUILD fuzzpy-9999.ebuild 780 RMD160 3a6f4da6e4aed37711f1b4fd8eec1d39be61f8a9 SHA1 7221db1f02e18710227dbec36bab0c65c622fca4 SHA256 44a03712ec67e99fa92d1864caa6b3a94bf9eb194663f514c31a76ade038d6f8
diff --git a/dev-python/fuzzpy/fuzzpy-0.4.0.ebuild b/dev-python/fuzzpy/fuzzpy-0.4.0.ebuild
index ca27c96..662253e 100644
--- a/dev-python/fuzzpy/fuzzpy-0.4.0.ebuild
+++ b/dev-python/fuzzpy/fuzzpy-0.4.0.ebuild
@@ -10,21 +10,23 @@ inherit distutils eutils
 DESCRIPTION="FuzzPy is a library for fuzzy sets, fuzzy graphs, and general fuzzy
 mathematics for Python."
 HOMEPAGE="http://github.com/ezod/fuzzpy"
-SRC_URI="http://pypi.python.org/packages/source/f/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://pypi/f/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 x86"
 IUSE="doc gnuplot pydot"
 
-RDEPEND="virtual/python"
+RDEPEND="
+	gnuplot? ( dev-python/gnuplot-py )
+	pydot? ( media-gfx/pydot )
+"
 DEPEND="${RDEPEND}
-		dev-python/setuptools
-		doc? ( dev-python/epydoc )
-		gnuplot? ( dev-python/gnuplot-py )
-		pydot? ( media-gfx/pydot )"
+	dev-python/setuptools
+	doc? ( dev-python/epydoc )
+"
 
-DOCS="AUTHORS README.markdown RELEASE-NOTES"
+DOCS="AUTHORS RELEASE-NOTES"
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/fuzzpy/fuzzpy-9999.ebuild b/dev-python/fuzzpy/fuzzpy-9999.ebuild
index 2681fc2..f18cba8 100644
--- a/dev-python/fuzzpy/fuzzpy-9999.ebuild
+++ b/dev-python/fuzzpy/fuzzpy-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2:2.6"
 EGIT_REPO_URI="http://github.com/ezod/${PN}.git"
 EGIT_BRANCH="master"
 
-inherit distutils eutils git
+inherit distutils eutils git-2
 
 DESCRIPTION="FuzzPy is a library for fuzzy sets, fuzzy graphs, and general fuzzy
 mathematics for Python."
@@ -20,12 +20,14 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc gnuplot pydot"
 
-RDEPEND="virtual/python"
+RDEPEND="
+	gnuplot? ( dev-python/gnuplot-py )
+	pydot? ( media-gfx/pydot )
+"
 DEPEND="${RDEPEND}
-		dev-python/setuptools
-		doc? ( dev-python/epydoc )
-		gnuplot? ( dev-python/gnuplot-py )
-		pydot? ( media-gfx/pydot )"
+	dev-python/setuptools
+	doc? ( dev-python/epydoc )
+"
 
 DOCS="AUTHORS README.markdown RELEASE-NOTES"
 
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index b596dbf..5640d9e 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1,4 +1,4 @@
 DIST Polygon-2.0.4.zip 73544 RMD160 dfb26325998f3e8b44ac36f6ef2c0be30b8d9fd9 SHA1 aa734572c911c0ddb4b39d1bf21f8ecbfa3685c8 SHA256 a9a85d81cc9faabba398001b1e9d32444e98147ac6e31cbdc5ef512c4f7c43dd
 DIST Polygon-3.0.4a-src.zip 163024 RMD160 be1fca82612a7f70d0da70a217b1b7ec4c9a1c9a SHA1 5030b2c687b2d5b70437d6d5fc341fac818c99dd SHA256 2ebef747544660a17a4aefc5a5a8429b6c64af8e0044130f98ed241b48e8fd9d
-EBUILD polygon-2.0.4.ebuild 576 RMD160 8d3d973c3afdd692caa83bae675d385378a76671 SHA1 eb4a262d4841d2901cb4cc3fee70017f7cf7f800 SHA256 ae856cd649fd2da0270ac6a1120bc695b627af5766297b940f68366bb06b4a17
-EBUILD polygon-3.0.4a.ebuild 583 RMD160 cd2f5b40afc2cef581eec35382b90d41f12a831d SHA1 8110a1c6f41746666639df4a757e85a77632d25e SHA256 011af6f2eceb09a02aeb34fc320c1f8bb6e2022e63be7a3b5f70f58d8a41c499
+EBUILD polygon-2.0.4.ebuild 578 RMD160 2c59a165f40cce6d399fa8db50d9e28da6125469 SHA1 c0c3e69bc983c17a75bd09d9d328c2b1da3ec98f SHA256 1d3d16e85d192d4281b9c91043b9442ce54f0246a57d7deb6bd80c0be7a67bfe
+EBUILD polygon-3.0.4a.ebuild 587 RMD160 afd84b71a8d7b79cfcf17f96a74da84b6c45537a SHA1 0ff003b4ec30fe93e87d6859f5b44bd6cffa700d SHA256 4d68cc8ef7076085bd09afa44af3a1a73804e36f7c836684f08c00134181521f
diff --git a/dev-python/polygon/polygon-2.0.4.ebuild b/dev-python/polygon/polygon-2.0.4.ebuild
index 2cc26ba..81c9123 100644
--- a/dev-python/polygon/polygon-2.0.4.ebuild
+++ b/dev-python/polygon/polygon-2.0.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Polygon is a python package that handles polygonal shapes in 2D."
 HOMEPAGE="http://www.j-raedler.de/projects/polygon/"
 SRC_URI="https://github.com/downloads/jraedler/Polygon2/Polygon-${PV}.zip"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/polygon/polygon-3.0.4a.ebuild b/dev-python/polygon/polygon-3.0.4a.ebuild
index 978434b..e06e58b 100644
--- a/dev-python/polygon/polygon-3.0.4a.ebuild
+++ b/dev-python/polygon/polygon-3.0.4a.ebuild
@@ -13,9 +13,9 @@ DESCRIPTION="Polygon is a python package that handles polygonal shapes in 2D."
 HOMEPAGE="http://www.j-raedler.de/projects/polygon/"
 SRC_URI="https://github.com/downloads/jraedler/Polygon3/Polygon-${PV}-src.zip"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 SLOT="3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 5577f1f..37ff2f3 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,2 +1,2 @@
 DIST progressbar-2.2.tar.gz 5118 RMD160 13f59c0c3155cd120eef11c7736f6363d33fa136 SHA1 a6ccec7c4d908a0c9d5ed1831ca9947df003407c SHA256 dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3
-EBUILD progressbar-2.2.ebuild 442 RMD160 1fd8ff37755faaa3ba990d4cc3a1de109d47679c SHA1 68e8336f595742bf6c03a8dcc7711d856898df56 SHA256 bd1444ad53943c4d5da66471d9c3689f53d9664b28775499286ffe88dec87703
+EBUILD progressbar-2.2.ebuild 413 RMD160 6408a123911b3fcb1f2d53d18e4db5d083508871 SHA1 f88a161105765a201b7d04570b1e6c53d483cdd5 SHA256 3941107c7540ef78fee38fc4d6e0dc129432db7e46ed94edd058a5e7b4ba95a5
diff --git a/dev-python/progressbar/progressbar-2.2.ebuild b/dev-python/progressbar/progressbar-2.2.ebuild
index 1e5a447..53e1312 100644
--- a/dev-python/progressbar/progressbar-2.2.ebuild
+++ b/dev-python/progressbar/progressbar-2.2.ebuild
@@ -10,11 +10,11 @@ inherit distutils
 
 DESCRIPTION="Text progressbar library for Python"
 HOMEPAGE="http://pypi.python.org/pypi/progressbar"
-SRC_URI="http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL"
+LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
index 3ff0aa4..6509e3a 100644
--- a/dev-python/visual/Manifest
+++ b/dev-python/visual/Manifest
@@ -1,2 +1,2 @@
 DIST visual-5.72_release.tar.bz2 5742709 RMD160 51a6deb152ba4b93b391cae6ab8df8375cf50933 SHA1 7d49e9a93f34692cdd0cbf030fa9a5be99391560 SHA256 02e28e33f0a813c6823c10d4821f2afa9366513e5f1a3392e01b012599f15f6d
-EBUILD visual-5.72.ebuild 1959 RMD160 54354ca632c0035d86fa15f5dfa262adf1a74b9e SHA1 51cf943a1a8e134a4b71c76a6a62a2011e673777 SHA256 ac6eeddfd7edd21481af7a6c7e1a48eaef2a2e46f582fd70a407af8a53cb380d
+EBUILD visual-5.72.ebuild 1949 RMD160 4bac4fd3398824bbc99a34a012300ef8a1ce81c8 SHA1 aec7ae6a787fde84af3d472f7ad6b23b468110d0 SHA256 ea60e83b5130d540e205497549980f8645743c2a461ea0bcc1631b7d0892ba2a
diff --git a/dev-python/visual/visual-5.72.ebuild b/dev-python/visual/visual-5.72.ebuild
index ecc0205..695c9aa 100644
--- a/dev-python/visual/visual-5.72.ebuild
+++ b/dev-python/visual/visual-5.72.ebuild
@@ -18,15 +18,16 @@ SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2"
 
 IUSE="doc examples"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="visual"
 
-RDEPEND=">=dev-libs/boost-1.41.0[python]
+RDEPEND="
+	>=dev-libs/boost-1.41.0[python]
 	dev-cpp/libglademm
 	>=dev-cpp/gtkglextmm-1.2
 	dev-python/numpy
- 	dev-python/polygon
- 	>=dev-python/ttfquery-1.0.4
+	dev-python/polygon
+	dev-python/ttfquery
 	dev-python/fonttools"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-libs/artoolkit/Manifest b/media-libs/artoolkit/Manifest
index 2c77972..14fa0fa 100644
--- a/media-libs/artoolkit/Manifest
+++ b/media-libs/artoolkit/Manifest
@@ -1,2 +1,2 @@
 DIST ARToolKit-2.72.1.tgz 1012522 RMD160 ce22e7201e0aaba05857dee15acc40b5c985724e SHA1 38facf5f3ba189cb4e0a4045ee737c8adde0402d SHA256 1a49a67c6e196b0e9990e90255ce840287ac47b5a53371a68a6dd93a5425d259
-EBUILD artoolkit-2.72.1-r4.ebuild 4277 RMD160 4a205d8e5f03d461f06c32c711debfa4ff85311d SHA1 91aa64ec6662b889d83ce7924e4e7f4ef0c2f977 SHA256 6f1a27cce04b91e6475dd2f3a19c35850f2babe670803c85c8422a00e9c1167a
+EBUILD artoolkit-2.72.1-r4.ebuild 4173 RMD160 8b260d76f3ca6cef9f30491e1b4fd5f28687bac0 SHA1 8840425c205e2fc1b2afc65e0f05d32ba11005d9 SHA256 9faf2c8183d8ef5ead5a4342b3858d3aa98e001e0c099bc1822b1eab9da890f9
diff --git a/media-libs/artoolkit/artoolkit-2.72.1-r4.ebuild b/media-libs/artoolkit/artoolkit-2.72.1-r4.ebuild
index f0b15ec..db4f191 100644
--- a/media-libs/artoolkit/artoolkit-2.72.1-r4.ebuild
+++ b/media-libs/artoolkit/artoolkit-2.72.1-r4.ebuild
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/artoolkit/ARToolKit-${PV}.tgz"
 
 S="${WORKDIR}/ARToolKit"
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -18,19 +17,17 @@ IUSE="debug jpeg gstreamer dv ieee1394 doc examples utils"
 #openVRML"
 RDEPEND=""
 DEPEND="media-libs/freeglut
-	|| ( x11-drivers/nvidia-drivers 
-	     x11-drivers/xf86-video-intel  
-             x11-drivers/ati-drivers 
-             x11-drivers/xf86-video-radeonhd  
-             x11-drivers/xf86-video-ati )
+	|| ( x11-drivers/nvidia-drivers
+	     x11-drivers/xf86-video-intel
+		 x11-drivers/ati-drivers
+		 x11-drivers/xf86-video-ati )
 	jpeg? ( media-libs/jpeg )
 	gstreamer? (
 	jpeg? ( media-plugins/gst-plugins-jpeg )
 	dv? ( media-plugins/gst-plugins-dv
-		media-plugins/gst-plugins-raw1394 )
+		  media-plugins/gst-plugins-raw1394 )
 	ieee1394? ( media-plugins/gst-plugins-raw1394 )
-	!ieee1394? ( media-plugins/gst-plugins-v4l
-			media-plugins/gst-plugins-v4l2 )
+	!ieee1394? ( media-plugins/gst-plugins-v4l2 )
 	>media-libs/gstreamer-0.8
 	>media-libs/gst-plugins-base-0.8
 	)"
@@ -49,7 +46,6 @@ check_v4l() {
 }
 
 check_ieee1394() {
-
 	local msg
 	if use dv; then
 		msg="Checking for ieee1934 and dv kernel Support"
diff --git a/media-sound/pykaraoke/Manifest b/media-sound/pykaraoke/Manifest
index 092fa6a..c6154ce 100644
--- a/media-sound/pykaraoke/Manifest
+++ b/media-sound/pykaraoke/Manifest
@@ -1,2 +1,2 @@
 DIST pykaraoke-0.7.5.zip 872237 RMD160 49e45b0c26b86363fd721068c68b73c2420ce5cb SHA1 7f0193cb7140fe8304e2f2df060e8eea0d139da0 SHA256 d2a5f02fd655ef32dba151324ce5f23be1bdac36603ade47870d28ce8e8430c6
-EBUILD pykaraoke-0.7.5.ebuild 527 RMD160 40cff7cf0a8f226d8106d89c03e2d1b9d30ebe29 SHA1 dd215abc418017b2eb9def78e1ef08c5c9717c10 SHA256 bd71084a11f59c40ddb3c1c6e04791f223129d861347df0878cfa630c8dbc888
+EBUILD pykaraoke-0.7.5.ebuild 522 RMD160 e4da8242cc54931e9a72b9c6ca8d4cfed106c10d SHA1 ae5a5ed7c2ef84701196ea7a474f0688544aeb4e SHA256 8c6089a06a59e0d0ee3330cd66386a6434bc0bee6a45d655acc8bfef196ceb3d
diff --git a/media-sound/pykaraoke/pykaraoke-0.7.5.ebuild b/media-sound/pykaraoke/pykaraoke-0.7.5.ebuild
index f4ff86e..d054b9b 100644
--- a/media-sound/pykaraoke/pykaraoke-0.7.5.ebuild
+++ b/media-sound/pykaraoke/pykaraoke-0.7.5.ebuild
@@ -17,8 +17,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+mutagen"
 
-DEPEND="dev-python/pygame
-        >=dev-python/wxpython-2.6
-		media-libs/libsdl"
+DEPEND="
+	dev-python/pygame
+	>=dev-python/wxpython-2.6
+	media-libs/libsdl
+"
 RDEPEND="${DEPEND}
-		mutagen? ( media-libs/mutagen )"
+	mutagen? ( media-libs/mutagen )
+"
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 7889e8b..0f934fc 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,5 +1,3 @@
 DIST flann-1.6.10-testdata.tar.xz 26425552 RMD160 2a1b7a34f6d5361ba037b01c1afec79f911e0dcd SHA1 cf11d7fbcc82da8567d0fb73789375f00ac2bdd8 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364
-DIST flann-1.7.0-src.zip 596775 RMD160 0610b5eeb886edc5e99d87faa76bdcbfbbccacff SHA1 50f1a1c7edf26f447fc9956bc45aa537b9b0f432 SHA256 8f548eaf8351cb3378ecd39a52b1d1c64b8e406a7a7512682be273739a2ac07d
 DIST flann-1.7.1-src.zip 582517 RMD160 cec1ce99d2c91ddf8f20d5aa8009a08c5347b904 SHA1 61b9858620528919ea60a2a4b085ccc2b3c2d138 SHA256 eafb8c07cf59ff050be149b15d620ca3dd162e3fce9cb6748cde5d92e0dac775
-EBUILD flann-1.7.0.ebuild 2324 RMD160 049785833e61d2b285d48fdc29f56de215af4967 SHA1 cd5c566e57f0dbc893d6d70dd1e535d658f44c28 SHA256 8aca9c69497544d189e32329f44417118096d86fa7e79cbd4f99df2b27828e2d
-EBUILD flann-1.7.1.ebuild 2324 RMD160 049785833e61d2b285d48fdc29f56de215af4967 SHA1 cd5c566e57f0dbc893d6d70dd1e535d658f44c28 SHA256 8aca9c69497544d189e32329f44417118096d86fa7e79cbd4f99df2b27828e2d
+EBUILD flann-1.7.1.ebuild 2328 RMD160 a9bf6d2ed94759c4ac5d0883c7b2ab87405bb7f9 SHA1 61b2b056cc1effec0aa5cdfd1bf43e8475f7fc95 SHA256 2c1964418f83e0b0fc9b367658ebb74ebb77a2589567c6cfea7de61f9331d17e
diff --git a/sci-libs/flann/flann-1.7.1.ebuild b/sci-libs/flann/flann-1.7.1.ebuild
index 9a76a0c..30cb3cf 100644
--- a/sci-libs/flann/flann-1.7.1.ebuild
+++ b/sci-libs/flann/flann-1.7.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
 EAPI=3
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_DEPEND="python? 2"
 
 inherit cmake-utils eutils python
 
@@ -14,7 +15,7 @@ SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc mpi octave python static-libs test"
 
 RDEPEND="sci-libs/hdf5[mpi?]
diff --git a/sci-libs/gandalf/Manifest b/sci-libs/gandalf/Manifest
index ed6c32c..f2081bc 100644
--- a/sci-libs/gandalf/Manifest
+++ b/sci-libs/gandalf/Manifest
@@ -1,3 +1,3 @@
 AUX gandalf-1.6-destdir.patch 785 RMD160 d872cf4de289e9a7a6bf643085b8406c2ad5427a SHA1 aae55085db0b1aff9d698743d946772803308b0e SHA256 4848323251d5bcd45e5034778269923eacce03ec77f34027b32d17e8d65bec33
 DIST gandalf.1.6.tar.gz 6731606 RMD160 8a986ffc7f1230cf9390982e583772f3ce0de697 SHA1 8e75dc0f96b47fa808b5f0bd70f5aed5b07fcb3c SHA256 2ad526966623e67637c4c7c7ca10b8b096f9c9c1d5727439b799aaea480e4d83
-EBUILD gandalf-1.6.ebuild 1222 RMD160 4a90b3e9c47086fa65b3f2c1aea8c6f67bbf1f12 SHA1 7ef1180dcf938c0a7ec377f4fd1b0b86269c01d5 SHA256 0a1bbf993b4a627f5c580b7e79788136d54eb6d2a2ad0bdb2664849a999bfeda
+EBUILD gandalf-1.6.ebuild 1214 RMD160 7d8c7e390831d1ec1bf643417993e9264252aae9 SHA1 fdc212073d90ec23ad20f17e2fffe3514052bb0f SHA256 795aac9f7f4ca936bbbf4088c2effda502fe22aa7b0c2687239120ed3237005f
diff --git a/sci-libs/gandalf/gandalf-1.6.ebuild b/sci-libs/gandalf/gandalf-1.6.ebuild
index 4237162..e53cf1e 100644
--- a/sci-libs/gandalf/gandalf-1.6.ebuild
+++ b/sci-libs/gandalf/gandalf-1.6.ebuild
@@ -10,17 +10,21 @@ SRC_URI="mirror://sourceforge/gandalf-library/gandalf.1.6.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc lapack jpeg png tiff opengl glut"
 
-RDEPEND="lapack? ( virtual/lapack )
-		 jpeg? ( media-libs/jpeg )
-		 png? ( media-libs/libpng )
-		 tiff? ( media-libs/tiff )
-		 opengl? ( glut? ( virtual/glut ) )"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	opengl? ( glut? ( media-libs/freeglut ) )
+"
 DEPEND="${RDEPEND}
-	    sys-devel/libtool
-        doc? ( app-doc/doxygen )"
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+"
+
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
@@ -29,7 +33,6 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-destdir.patch"
 }
 
-
 src_compile() {
 	econf \
 		$(use_with lapack) \
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 534d8c2..7de09af 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,4 @@
 AUX pcl-1.4.0-vtk.patch 2443 RMD160 26823e6d3b00ea32470d00a33fdea2353662f64b SHA1 b4b76b6953d4e8c93ff3f7574eda9f20c5cdbf7b SHA256 b388627bf89c16b6d5e682314311c4b9ddc4c49b7eb0c4f17d99fbc0b767280d
 AUX pcl-1.4.0-with.patch 817 RMD160 b896b3965c3c46f824accbdb7656f3736f49bfc8 SHA1 b9528fc4a637020302957abd7a8bd2502fea01ce SHA256 60dee8979a413143f0fc6705279495abb068b2f65bc6b6392e97a57de4966a5b
 DIST PCL-1.4.0-Source.tar.bz2 10626702 RMD160 440de4c12c4aba81d2b6197180df85e008eef4d9 SHA1 dc2f89cfafb098c27291549115d39cc6b425d31f SHA256 20d49246773bb54d4b9e133ef3b8b5081c94d1677d823cc0c2d03bcd5bf30a2b
-EBUILD pcl-1.4.0.ebuild 1516 RMD160 f593cb34d9b739a0c8c3e7e303af24c444538a0e SHA1 f3898d8739f4cf1a5d2fc9af5cb86de520b6f338 SHA256 f733da6b3f6e58dc19ca2af5922c1bd2d16c7cd4c7c1c0a843473cb523ea2c6d
+EBUILD pcl-1.4.0.ebuild 1519 RMD160 55ba53b1af82c61f3d99aa825014159f96fe56b1 SHA1 a18ea59cafc5ec9465857ccae4ce1728ff744ceb SHA256 3879f575b6b8d80ecd9b91bed16bfd60d8244ac8ea74fc8e7c0f554014d34470
diff --git a/sci-libs/pcl/pcl-1.4.0.ebuild b/sci-libs/pcl/pcl-1.4.0.ebuild
index 8873bf9..ff885fc 100644
--- a/sci-libs/pcl/pcl-1.4.0.ebuild
+++ b/sci-libs/pcl/pcl-1.4.0.ebuild
@@ -23,11 +23,12 @@ RDEPEND="
 	>=sci-libs/flann-1.7.1
 	>=media-libs/qhull-2010.1
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-	doc? ( app-doc/doxygen )
 	mpi? ( virtual/mpi )
 	vtk? ( >=sci-libs/vtk-5.6.0 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-with.patch"
@@ -41,7 +42,7 @@ src_prepare() {
 	base_src_prepare
 
 	if has_version ">=sci-libs/vtk-5.8.0"; then
-		epatch ${FILESDIR}/${P}-vtk.patch
+		epatch "${FILESDIR}/${P}-vtk.patch"
 	fi
 }
 
diff --git a/sci-misc/swarm/Manifest b/sci-misc/swarm/Manifest
index 66861f0..8a88e0e 100644
--- a/sci-misc/swarm/Manifest
+++ b/sci-misc/swarm/Manifest
@@ -1,3 +1,3 @@
 AUX swarm-2.2.3-amd64.patch 505 RMD160 8a491f26d134c2393b1edfcd9bd1ae423f400d11 SHA1 ed8cc60fe250ca046c366017c5d5bcaefe319439 SHA256 33cbf9839de4950e3c16975deead12a00a461911b9025acdc21ed33d6895de6f
 DIST swarm-2.2.3.tar.gz 2960666 RMD160 d99a33c423a83c6fbb4bad6b9abf554b86879af7 SHA1 e2aa16835b749dcff4f5f8c638902fb8683128cf SHA256 908412f08ae53c321a403c737de30ffa5c905d0b6f5a947bb306f08a2116be7b
-EBUILD swarm-2.2.3.ebuild 1455 RMD160 b5fdeedfd0f70b2a54bab160a99b8b2ff6477b0c SHA1 232ca6909c01d2a9e996046a362f6031e28659a2 SHA256 1381f74f08a25217e1c42aa6a0ad2674a16bc858f001161aa47ffc7b2d68534e
+EBUILD swarm-2.2.3.ebuild 1022 RMD160 bbbdb85dc3a28f0ed695ee637f78593e3642adfb SHA1 1da1c1b0bf6674975896ce7cd18cc55bf50c880e SHA256 a5fcaf3c849cac7b181dddd5b9649146495d67aa527eb3d5392bb6b77c8278e8
diff --git a/sci-misc/swarm/swarm-2.2.3.ebuild b/sci-misc/swarm/swarm-2.2.3.ebuild
index e60c683..610cf63 100644
--- a/sci-misc/swarm/swarm-2.2.3.ebuild
+++ b/sci-misc/swarm/swarm-2.2.3.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+EAPI=4
+
+inherit eutils java-pkg-2
 
 DESCRIPTION="Swarm is a platform for agent-based models."
 HOMEPAGE="http://www.swarm.org"
@@ -13,34 +15,25 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="java hdf5"
 
-DEPEND="dev-lang/tcl
-		dev-lang/tk
-		dev-tcltk/blt
-		>=media-libs/libpng-1.2.5
-		>=sys-libs/zlib-1.2.2
-		x11-libs/libXpm
-		virtual/emacs
-		hdf5? ( >=sci-libs/hdf5-1.6.2 )
-		java? ( >=virtual/jdk-1.4.2 )"
+DEPEND="
+	sys-devel/gcc[objc]
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/blt
+	>=media-libs/libpng-1.2.5
+	>=sys-libs/zlib-1.2.2
+	x11-libs/libXpm
+	virtual/emacs
+	hdf5? ( >=sci-libs/hdf5-1.6.2 )
+	java? ( >=virtual/jdk-1.4.2 )
+"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if ! built_with_use --missing false gcc objc ; then
-		eerror "Your GCC compiler has been built without Objective-C support."
-		eerror "Please enable the 'objc' USE flag and re-emerge sys-devel/gcc."
-		elog "You can enable this USE flag either globally in /etc/make.conf,"
-		elog "or just for specific packages in /etc/portage/package.use."
-		die "sys-devel/gcc missing objc support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-amd64.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-amd64.patch"
+)
 
-src_compile() {
+src_configure() {
 	javaconf="--without-jdkdir"
 	use java && javaconf="--with-jdkdir=`java-config -O`"
 	hdf5conf="--without-hdf5dir"
@@ -50,7 +43,6 @@ src_compile() {
 		${javaconf} \
 		${hdf5conf} \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/x11-misc/tinybat/Manifest b/x11-misc/tinybat/Manifest
index adf387c..7350c48 100644
--- a/x11-misc/tinybat/Manifest
+++ b/x11-misc/tinybat/Manifest
@@ -1,3 +1,3 @@
 DIST tinybat-0.2.0.tar.bz2 22818 RMD160 559bfd9d9aa739ce7667de52f306580f6dbc05e6 SHA1 c4830b9532221aee45bc2a58ba981e52e4ca2a0f SHA256 b00c038ba2c4df5864cf45befdd04aa1a36a7ad53386b3ec51627769fcdc6ff7
-EBUILD tinybat-0.2.0.ebuild 519 RMD160 72ae9ace4385d8197b153532ea82669e6fa8429e SHA1 362de612ee1529b90ad59d6ea912194cfa1c0186 SHA256 8f4fed322f891b6142dede45d28a4a347843dd3e5b0183cbd7daa4cc05429326
-EBUILD tinybat-9999.ebuild 561 RMD160 8dcaccbf0f9cd42f592dbf93a3f9b64b0479955f SHA1 0abc481bdd0097eee29b19aba64dd8b01ad09689 SHA256 9c98a1cb5e1280bf9b0c5b04aaa14d61f63bb9e34a63d4f1b7cf23779d00d597
+EBUILD tinybat-0.2.0.ebuild 500 RMD160 b5e71ba518b09cb57d0cb2615836a2dade02f735 SHA1 518e1a2e8351e12a476f015f33d763ef3d1f27f5 SHA256 55656f2b353e129e815fd818be9a9467dadc074aec2e08830ebeaa2a844eeaf8
+EBUILD tinybat-9999.ebuild 530 RMD160 bec2b6e32255bc28d996bd9838edc3ce32608962 SHA1 915544ec6f588bd573eae91408becf362d654a91 SHA256 fc05291c2ff5ae4cb65e6e92b0d490b78c6f31627ec31ce943fb42d469b55294
diff --git a/x11-misc/tinybat/tinybat-0.2.0.ebuild b/x11-misc/tinybat/tinybat-0.2.0.ebuild
index 93f81a6..b35256e 100644
--- a/x11-misc/tinybat/tinybat-0.2.0.ebuild
+++ b/x11-misc/tinybat/tinybat-0.2.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="3"
-PYTHON_DEPEND="2:2.5"
+PYTHON_DEPEND="2"
 
 inherit distutils
 
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="virtual/python
-		 dev-python/pygtk"
+RDEPEND="
+	dev-python/pygtk
+"
 DEPEND="${RDEPEND}
-		dev-python/setuptools"
+	dev-python/setuptools
+"
 
 DOCS="AUTHORS README TODO"
diff --git a/x11-misc/tinybat/tinybat-9999.ebuild b/x11-misc/tinybat/tinybat-9999.ebuild
index 0c634af..fd5aeb8 100644
--- a/x11-misc/tinybat/tinybat-9999.ebuild
+++ b/x11-misc/tinybat/tinybat-9999.ebuild
@@ -3,12 +3,12 @@
 # $Header: $
 
 EAPI="3"
-PYTHON_DEPEND="2:2.5"
+PYTHON_DEPEND="2"
 
 EGIT_REPO_URI="git://github.com/ezod/tinybat.git"
 EGIT_BRANCH="master"
 
-inherit distutils eutils git
+inherit distutils eutils git-2
 
 DESCRIPTION="Tinybat - a standalone battery monitor for the rest of us."
 HOMEPAGE="http://code.google.com/p/tinybat"
@@ -16,12 +16,14 @@ SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
-RDEPEND="virtual/python
-	     dev-python/pygtk"
+RDEPEND="
+	dev-python/pygtk
+"
 DEPEND="${RDEPEND}
-		dev-python/setuptools"
+	dev-python/setuptools
+"
 
 DOCS="AUTHORS README TODO"
diff --git a/x11-wm/wmname/Manifest b/x11-wm/wmname/Manifest
index 87a7a26..03c4d38 100644
--- a/x11-wm/wmname/Manifest
+++ b/x11-wm/wmname/Manifest
@@ -1,2 +1,2 @@
 DIST wmname-0.1.tar.gz 2512 RMD160 88e52d49576ae472a45bd40c79ec04071160bbce SHA1 7bce60306ccc9c9a5fc60d9874e81a013efa8871 SHA256 559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5
-EBUILD wmname-0.1.ebuild 502 RMD160 6edc0bd14ebc6cda42ce1305fc74a59d9fa288c6 SHA1 69b995793e0ab3be64c2ee2bf6bedaa06e18a248 SHA256 98a9f2b9ce408f63cdc78265bb7d5ce4fa3c3fe6e32f2547059b52d821f770cb
+EBUILD wmname-0.1.ebuild 478 RMD160 de0a7690cb6a7b233f8571c647af06975a547b45 SHA1 e02d66fc4b6c4baddba4217d8cb9363005f3c984 SHA256 9dc9c236174ba6c90bd8024de5125c5bfeee8f36e467790f55e6c5d8e05b9df3
diff --git a/x11-wm/wmname/wmname-0.1.ebuild b/x11-wm/wmname/wmname-0.1.ebuild
index 10c2290..a6fb1b9 100644
--- a/x11-wm/wmname/wmname-0.1.ebuild
+++ b/x11-wm/wmname/wmname-0.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 2008-2012 Funtoo Technologies
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-DESCRIPTION="wmname prints/sets the window manager name property of the root
-window similar to how hostname(1) behaves."
+EAPI=4
+
+DESCRIPTION="wmname prints/sets the window manager name property of the root window."
 HOMEPAGE="http://tools.suckless.org/wmname"
 SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
 
@@ -12,8 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
 
 src_install() {
 	dodoc README