diff --git a/app-admin/mmc-agent/Manifest b/app-admin/mmc-agent/Manifest
index 40bfe64..6317abd 100644
--- a/app-admin/mmc-agent/Manifest
+++ b/app-admin/mmc-agent/Manifest
@@ -2,10 +2,7 @@ AUX mmc-agent-2.3.1-kerberos-1.patch 16835 RMD160 c7bc79766967ed988a6b9d85be73a5
 AUX mmc-agent-2.3.2-powerdns-1.patch 37711 RMD160 dfade7296129ea3a302fad701845d057e9050bd4 SHA1 711c0dd404ce59470e3b1418a9f83726a10e0aac SHA256 6c0f6df0dccca0b42d0860c289333e3d670fa1ef416885bdf561124aec45d258
 AUX mmc-agent-2.3.2-printing-1.patch 33371 RMD160 f7064ec4dfc2e923c522f01190ca5d4f7d493d43 SHA1 ca9219b982e210bd92c85db8f982e1a3c6b9d48b SHA256 97dc50bb286361286e5451d2e85ea9b9d8609a2f92c3f3ca3836e9bcbcd1c931
 AUX mmc-agent.initd 438 RMD160 d7dc64366782ab0d6fe4347d6a169b88a4e03a49 SHA1 e4ae8808678161237703bbb63b144899c9a544c9 SHA256 922d0bacad3eda749f8807e3ae5c183f636fa93e0d41d7079e570c58ebccb879
-DIST mmc-agent-2.3.1.tar.gz 111217 RMD160 7e75cbf9637a50214f7d2f1eee5049f7809d29aa SHA1 35f468ad4eb77ca4117695eb2b6ea83b38a01d46 SHA256 39e594a36f7cde73e6dfcc3845841137c0fe016c82c6343838fb8879931c757b
 DIST mmc-agent-2.3.2.tar.gz 120949 RMD160 871b3b7766d69019de392e42ebf25a216d217c71 SHA1 1e7c634243c00c6b214f24c3467315d31a444215 SHA256 0ac8ff97818c58008cadb3c6b08dba39e42b078fea9d392fda649e036eabaea2
-EBUILD mmc-agent-2.3.1.ebuild 1250 RMD160 0230a124ace55353571f7b1b201664bd45405999 SHA1 af139ef81aee700b236962b6622e9e8f2a8986cf SHA256 da0e889c925d0ce8442081c4f3155a4f82dce17b152a54be798ee7e25e4917a1
-EBUILD mmc-agent-2.3.2-r1.ebuild 1469 RMD160 3f9e2dccc2cc1fb37e18c162706dd7f6200d8254 SHA1 8ba7717a75cb9a8db5d03525a4a616f01ea1efff SHA256 84816741670ae12e6831eb8f7dc53a675428c513aae4bdf8f9a6a58e553629bd
-EBUILD mmc-agent-2.3.2.ebuild 1418 RMD160 7a008aa9b2c15677a8f9e907323382f044554b16 SHA1 041a7283d521585dda9d7176b1ff2c545dba753a SHA256 eae58b7b3f3624aace916e1d2374552abab449a01681f3c88191d8f1a8b4ab4f
+EBUILD mmc-agent-2.3.2-r1.ebuild 1415 RMD160 e43b8c0ee2ee9fd0efc658c35174a49381128390 SHA1 e4e7a67162d49696ecc77cffc1b8f2674cb07069 SHA256 dadedd726bbada2cf7c3b334746c3686badc5c05e82912d6e2c36f24ef0edff5
 MISC ChangeLog 1166 RMD160 5b77de3597adf5a373ebb950d87d309251c36e1c SHA1 e7b1b1f2343652781f364683b68454420ae97410 SHA256 071d623e7acda5a303e539c6848c88aa9b9d416f4581e11588613689d55cf9fa
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-admin/mmc-agent/mmc-agent-2.3.1.ebuild b/app-admin/mmc-agent/mmc-agent-2.3.1.ebuild
deleted file mode 100644
index abf714b..0000000
--- a/app-admin/mmc-agent/mmc-agent-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-# ESVN_REPO_URI="http://mds.mandriva.org/svn/mmc-agent"
-DESCRIPTION="The MMC Agent and its Python plugins."
-HOMEPAGE="http://mds.mandriva.org/"
-SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-SLOT="0"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1
-	>=dev-python/twisted-web-0.7.0
-	>=dev-python/python-ldap-2.2.1"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-kerberos-1.patch
-}
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/*
-	insinto etc/mmc/agent/keys
-	doins -r conf/agent/keys/*
-	insinto etc/mmc/agent
-	doins -r conf/agent/*.ini
-	insinto etc/mmc/plugins
-	doins -r conf/plugins/*.ini
-
-	newinitd "${FILESDIR}"/mmc-agent.initd mmc-agent
-}
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
-
-pkg_postinst() {
-	elog "To disable some plugin in your mmc environments, you have to set"
-	elog "disable to 1 in /etc/mmc/plugins/*.ini"
-	elog "(one config file per service)"
-	elog "You can't disable the base plugin."
-}
diff --git a/app-admin/mmc-agent/mmc-agent-2.3.2-r1.ebuild b/app-admin/mmc-agent/mmc-agent-2.3.2-r1.ebuild
index e29454a..c310b93 100644
--- a/app-admin/mmc-agent/mmc-agent-2.3.2-r1.ebuild
+++ b/app-admin/mmc-agent/mmc-agent-2.3.2-r1.ebuild
@@ -4,7 +4,6 @@
 
 inherit distutils
 
-# ESVN_REPO_URI="http://mds.mandriva.org/svn/mmc-agent"
 DESCRIPTION="The MMC Agent and its Python plugins."
 HOMEPAGE="http://mds.mandriva.org/"
 SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/${P}.tar.gz"
@@ -23,7 +22,7 @@ DEPEND=">=dev-python/setuptools-0.6_rc1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.3.1-kerberos-1.patch
 	epatch "${FILESDIR}"/${PN}-2.3.2-printing-1.patch
 	epatch "${FILESDIR}"/${PN}-2.3.2-powerdns-1.patch
diff --git a/app-admin/mmc-agent/mmc-agent-2.3.2.ebuild b/app-admin/mmc-agent/mmc-agent-2.3.2.ebuild
deleted file mode 100644
index 10e92c8..0000000
--- a/app-admin/mmc-agent/mmc-agent-2.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-# ESVN_REPO_URI="http://mds.mandriva.org/svn/mmc-agent"
-DESCRIPTION="The MMC Agent and its Python plugins."
-HOMEPAGE="http://mds.mandriva.org/"
-SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/python-ldap-2.2.1
-	>=dev-python/psycopg-2.0.2"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${PN}-2.3.1-kerberos-1.patch
-	epatch "${FILESDIR}"/${PN}-2.3.2-printing-1.patch
-}
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/*
-	insinto etc/mmc/agent/keys
-	doins -r conf/agent/keys/*
-	insinto etc/mmc/agent
-	doins -r conf/agent/*.ini
-	insinto etc/mmc/plugins
-	doins -r conf/plugins/*.ini
-	insinto usr/share/doc/${P}
-	doins -r contrib
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/mmc-agent.initd mmc-agent
-}
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
-
-pkg_postinst() {
-	elog "To disable some plugin in your mmc environments, you have to set"
-	elog "disable to 1 in /etc/mmc/plugins/*.ini"
-	elog "(one config file per service)"
-	elog "You can't disable the base plugin."
-}