diff --git a/app-admin/ocsinventory-agent/Manifest b/app-admin/ocsinventory-agent/Manifest
new file mode 100644
index 0000000..741216e
--- /dev/null
+++ b/app-admin/ocsinventory-agent/Manifest
@@ -0,0 +1,2 @@
+DIST Ocsinventory-Unix-Agent-2.0.5.tar.gz 1707443 SHA256 7ef1c25dce5f1e0854abc423513c1733219cc73e4c36057dbdad6757e1609a64 SHA512 99ebf61a4e8274be7deae32448594cc213e69ef67239c99e6f05b41f2624d95105632bd00c57a747d8aa5b4d7a31ff6fab9afbf618a2d9bfd3b28bb500b6f095 WHIRLPOOL a64cd5b0fa61128619ca5f2cfb3606e886a987ae2ec70e44d41bbb9d7be54276a938c1970b1f9720cbafb1690248216c6244670b85f76bfe997fa1bf9530379c
+EBUILD ocsinventory-agent-2.0.5.ebuild 2328 SHA256 2b60a22823fa27699ec19996870eb7813c3f407b353c62e165828a9ecf32a495 SHA512 bea18388833a2d0b3ccbcb8dc306c86bf6ccf2072b9e1d35928c45c26055b70bd65c7bf7dbbc1b70a121f5d3fff0d87ee7e5e1ee8a48114904374d76b56a0ff6 WHIRLPOOL 8ae1a899129468ae6f841c8b9cce305e2b48eb57500228e6be60a87964b66ca1f39bed694880bf2e33d7f3e3a9b2c9b6e0ccec210af6d74dfec3e800c0f1b3ca
diff --git a/app-admin/ocsinventory-agent/ocsinventory-agent-2.0.5.ebuild b/app-admin/ocsinventory-agent/ocsinventory-agent-2.0.5.ebuild
new file mode 100644
index 0000000..5323cf5
--- /dev/null
+++ b/app-admin/ocsinventory-agent/ocsinventory-agent-2.0.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit perl-module
+
+MY_N="Ocsinventory-Unix-Agent"
+MY_P="${MY_N}-${PV}"
+
+DESCRIPTION="Powerful inventory and package deployment system"
+HOMEPAGE="http://www.ocsinventory-ng.org/"
+SRC_URI="http://launchpad.net/${MY_N,,}/stable-2.0/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="logrotate ssl"
+
+RDEPEND="
+    perl-core/Digest-MD5
+    dev-perl/XML-Simple
+    dev-perl/LWP-UserAgent-Determined
+    dev-perl/Net-IP
+    dev-perl/Net-SSLeay
+    virtual/perl-File-Temp
+    logrotate? ( app-admin/logrotate )
+    ssl? ( dev-perl/Crypt-SSLeay )
+"
+
+src_prepare() {
+    # Workaround stupid sources
+    mv "${WORKDIR}/${MY_P}" "${S}"
+    cd "${S}"
+    sed -i -e "s:PATH_TO_LOG_DIRECTORY:/var/log/${PN}:" \
+	etc/logrotate.d/ocsinventory-agent
+
+    #epatch "${FILESDIR}"/equery-invocation.patch
+}
+
+src_install() {
+    mytargets=pure_install
+    perl-module_src_install
+
+    insinto /etc/ocsinventory-agent
+    doins etc/ocsinventory-agent/modules.conf
+
+    insinto /etc/cron.daily
+    echo -e "#!/bin/sh
+/usr/bin/ocsinventory-agent --logfile /var/log/${PN}/agent.log -s \`. /etc/default/ocsinventory-agent;echo \${SERVER}\`" \
+	> "${D}/etc/cron.daily/${PN}"
+    fperms 0755 /etc/cron.daily/${PN}
+
+    insinto /etc/default
+    doins etc/default/ocsinventory-agent
+
+    keepdir /var/{lib,log}/${PN}
+    if use logrotate ; then
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/ocsinventory-agent
+    fi
+}
+
+check_opt_pkg() {
+    if ! has_version $1; then
+	missing_opt_pkg="${missing_opt_pkg}\t- $1: ${@:2}\n"
+    fi
+}
+
+pkg_postinst() {
+    missing_opt_pkg=""
+    check_opt_pkg sys-apps/dmidecode "Read the BIOS stats"
+    check_opt_pkg sys-apps/pciutils  "List PCI devices"
+    check_opt_pkg net-analyzer/nmap  "Use the network discover feature"
+    check_opt_pkg x11-misc/read-edid "Get the serial number of the screen"
+    check_opt_pkg dev-perl/Net-CUPS  "Detect the printers"
+    check_opt_pkg sys-apps/smartmontools ""
+
+    if [[ -n $missing_opt_pkg ]]; then
+	elog "Following packages gives additional functionalities"
+	elog -n $missing_opt_pkg
+    fi
+
+    elog "A script has been installed in /etc/cron.daily/ for the OCS Inventory agent"
+    elog "to run regularly."
+}
diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest
index 99f57f3..0046420 100644
--- a/sys-block/partclone/Manifest
+++ b/sys-block/partclone/Manifest
@@ -1,2 +1,2 @@
-DIST partclone-0.2.68.tar.gz 566606 SHA256 502b7fe09c9746246305e44ec6aeda882edec544b7e26f0f9658b04d7a043f0c SHA512 75d5cb59ffe5f133fd32ff196177f79fcf2034be9d690ad35db5430e29d8f45b44bc451dce01b7f1f4a1258df232b0207fddca5fb6dd47990c8dc93277fea569 WHIRLPOOL 3a3cbd0d689675fbd8ab46bbd4d0dcce5c78c012f9fb7cb2b27a6f91c1fbb7118cf5a907880171701ffc68f7b742bd7fd68517cb134b0494363c13d3bd9f7e62
-EBUILD partclone-0.2.68.ebuild 2207 SHA256 6b4c0e3612abbd930742476d4cbf3bf81bdc90dbae1edf641ccd9b8d0950bfef SHA512 1cfb07440f35a8bc83b0b73692d03a7e628e4ff4530222bb641cac9f7946c6420c2f4a327f512977626aa945042cde4ed42a28244f20f32089b79af702248259 WHIRLPOOL e43e3a96d065e8b60e778b86fa08a05e5c90235f80c109079eb585a80f9e0ab5fb05de11f39bdc643e25705113faa012e77f8ae18d8b49579e1e8b79e9209264
+DIST partclone-0.2.69.tar.gz 566531 SHA256 2248b1e0387e9d44c45be091dd3fb29e2f0d079f42023b713e6cc19b54587f55 SHA512 70c5056fe31fbe1099e0f9603efa35ea7729d1af9efab692493a8e3e93b64c4b23c69d943185c62b4574089ed1320aedf67b93fab93c212e048eaaefb0905847 WHIRLPOOL ae33f335e69d7eba1a85a741705fbb93f300da963a9c0871980d3c0971035692c1583f6bb3976ddb145d5d61315e2c0965d1be54bbc776544537d0984d5d8894
+EBUILD partclone-0.2.69.ebuild 2270 SHA256 6904cea5e97259285b0aca68301a181db04828e4dc054a7293fc1a76dee23339 SHA512 d035e6ac4eef65f8368517530f8cab89b15c2dbc8d4ff4c35f0adf0421de70ce386baac4f3e44efb0a1e3f96a0dad7ae925407f00da2e10122732b0df243135c WHIRLPOOL eccbadcf8a54e52158341168b039a7d4860575515d85cca8e478806cf2347acb6c5b28eb6d0b09ff323e2236cd2ec7dd508728be2e0dede391c11cc33ad528b1
diff --git a/sys-block/partclone/partclone-0.2.68.ebuild b/sys-block/partclone/partclone-0.2.69.ebuild
similarity index 88%
rename from sys-block/partclone/partclone-0.2.68.ebuild
rename to sys-block/partclone/partclone-0.2.69.ebuild
index 5eb5f1b..39b4e3e 100644
--- a/sys-block/partclone/partclone-0.2.68.ebuild
+++ b/sys-block/partclone/partclone-0.2.69.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="Partition cloning tool"
 HOMEPAGE="http://partclone.org"
-SRC_URI="http://github.com/Thomas-Tsai/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sourceforge.net/projects/partclone/files/stable/${PV}/partclone_${PV}.orig.tar.gz/download -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,10 +27,11 @@ RDEPEND="${common_depends}
 	reiser4? ( sys-fs/reiser4progs )
 	xfs? ( >=sys-fs/xfsprogs-3.1.11-r1 )
 	static? ( sys-fs/e2fsprogs[static-libs]
-		      sys-fs/xfsprogs[static-libs]
-		      sys-libs/ncurses[static-libs]
-		      sys-fs/ntfs3g[static-libs]
-		   )"
+			sys-libs/e2fsprogs-libs[static-libs]
+			sys-fs/xfsprogs[static-libs]
+			sys-libs/ncurses[static-libs]
+			sys-fs/ntfs3g[static-libs]
+		)"
 DEPEND=""
 
 src_unpack()