diff --git a/app-admin/pulse2-inventory-server/ChangeLog b/app-admin/pulse2-inventory-server/ChangeLog
index 7e87e5b..75ae9ef 100644
--- a/app-admin/pulse2-inventory-server/ChangeLog
+++ b/app-admin/pulse2-inventory-server/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 May 2010; Mario Fetka <mario.fetka@gmail.com>
+  -pulse2-inventory-server-1.2.0.ebuild,
+  -pulse2-inventory-server-1.2.0-r1.ebuild,
+  -pulse2-inventory-server-1.2.1_p191.ebuild,
+  -pulse2-inventory-server-1.2.2_p197.ebuild,
+  -pulse2-inventory-server-1.2.3_p210.ebuild,
+  -pulse2-inventory-server-1.2.4_p221.ebuild,
+  +pulse2-inventory-server-1.2.4_p221-r1.ebuild,
+  +files/pulse2-inventory-server-1.2.4-install-target-1.patch:
+  delete old and make it python abi compatible
+
   18 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
   pulse2-inventory-server-1.2.0.ebuild,
   pulse2-inventory-server-1.2.0-r1.ebuild,
diff --git a/app-admin/pulse2-inventory-server/Manifest b/app-admin/pulse2-inventory-server/Manifest
index 4a8a221..26c3be9 100644
--- a/app-admin/pulse2-inventory-server/Manifest
+++ b/app-admin/pulse2-inventory-server/Manifest
@@ -1,14 +1,6 @@
+AUX pulse2-inventory-server-1.2.4-install-target-1.patch 2215 RMD160 75d9b6b585091974109c86d911bd8b5b860fd9e5 SHA1 a51595148e3ac7842effd58b42c2e5bb68282e88 SHA256 8635d03278d27896201c8db2436d71f39cb4ca0de56a4ab4f07ccfa749c14515
 AUX pulse2-inventory-server.initd 512 RMD160 5b606759f56264ae61d9bf151c815aa1c67c13db SHA1 2ca136a346b2cf68620ac663aac2d36ae86d2541 SHA256 dd52665b29cf60d100a8909455ecd7edb2d047c96e5654be343b8a4e97856c94
-DIST pulse2-inventory-server-1.2.0.tar.gz 25833 RMD160 30f9395e9160d6872bee225d421bb28243cc2e7f SHA1 2f71b783e357c62fe415e853baaa4666c4702ed3 SHA256 fc4b9599ff8be7b63e1c4019a97b8a6cf4a245b8a5c8f9dbaa758f59b1658b37
-DIST pulse2-inventory-server-1.2.1-191.tar.gz 27692 RMD160 f39c8c5a8b99c23a4d4ccf0947fef251c52fd92a SHA1 d05397e432037bfe3500a142958dd37bb49bf396 SHA256 a28075728cda253613f8cf721f94bdec1ea56d6ff45801dcba704abe88b70532
-DIST pulse2-inventory-server-1.2.2-197.tar.gz 27645 RMD160 4b8849e72a5e8d6ac5ceaa183f6f4861033d2a3f SHA1 8d20bc13eef71898f7a0cf2d52fe915abeb33dc1 SHA256 3f07813b3c5c71b4ebb2b4b1f29f5255c2a01790ba4570c24e6e462e20fd94e5
-DIST pulse2-inventory-server-1.2.3-210.tar.gz 26856 RMD160 89e1a6890d3af546efd3ae514a5e4be10e220370 SHA1 46f1f6adf22ff47fe5edea34556d65e647a72f1f SHA256 04539105bd86ef95149059156e5b26038ab3cbcc3be5071843de00ddfb6379dd
 DIST pulse2-inventory-server-1.2.4-221.tar.gz 26852 RMD160 c63b48a5fdfcc3a7b9fe65757a30b6e3120552d9 SHA1 0a5b8a6ce14bf9ae0df41a3ef50869b32c2e2319 SHA256 1bdf472e065c82ac2b44b845fff13187ae1df64b51c34232176b2cbf393c4914
-EBUILD pulse2-inventory-server-1.2.0-r1.ebuild 1207 RMD160 b85faa9facb8a7b21ea91a28c76f51178c975e90 SHA1 58ff03ff3bb337c1e97e93a4c3d62254616de2b4 SHA256 416a368427623104528f05cfefda5a92611e0584f9f136c540f5ac4921b7b71b
-EBUILD pulse2-inventory-server-1.2.0.ebuild 1260 RMD160 2083f38bddbbba89e6c4ca6ea1a6144fe3d827f7 SHA1 da77f0f5f228fdda71394b5f9a3a12ad46f1d303 SHA256 8073e7895117b1a1c28f8823163f45d54dcd4a4ed8e243843121cc40d45ada0d
-EBUILD pulse2-inventory-server-1.2.1_p191.ebuild 1338 RMD160 56e6db6febf460b2f40ad48dd015eba3a9e9c554 SHA1 45a0940c909ab470cb1469a97650c3494d269d8a SHA256 29b12f1709d2cc28dec681e62f6b54580d3938a79ea0545361e90a5827b78d68
-EBUILD pulse2-inventory-server-1.2.2_p197.ebuild 1338 RMD160 56e6db6febf460b2f40ad48dd015eba3a9e9c554 SHA1 45a0940c909ab470cb1469a97650c3494d269d8a SHA256 29b12f1709d2cc28dec681e62f6b54580d3938a79ea0545361e90a5827b78d68
-EBUILD pulse2-inventory-server-1.2.3_p210.ebuild 1338 RMD160 56e6db6febf460b2f40ad48dd015eba3a9e9c554 SHA1 45a0940c909ab470cb1469a97650c3494d269d8a SHA256 29b12f1709d2cc28dec681e62f6b54580d3938a79ea0545361e90a5827b78d68
-EBUILD pulse2-inventory-server-1.2.4_p221.ebuild 1338 RMD160 56e6db6febf460b2f40ad48dd015eba3a9e9c554 SHA1 45a0940c909ab470cb1469a97650c3494d269d8a SHA256 29b12f1709d2cc28dec681e62f6b54580d3938a79ea0545361e90a5827b78d68
-MISC ChangeLog 1840 RMD160 648f68382bfa992573b1e710fc4051853a8dd156 SHA1 36613dde0794548eb03998c065eba3294586de69 SHA256 035eebddf9fe2d8d604ea19a1db3c2457a6cbf5c4e69b3589047b46226e5a2cd
+EBUILD pulse2-inventory-server-1.2.4_p221-r1.ebuild 983 RMD160 404cae2adfed6f709c760debd009946cfbdd5094 SHA1 259941613780871b7c4dd3514bee1bc90d818971 SHA256 fe939eb0375c2809507be3f5d633e3d51ff2ea29ac55592e1dca201539672846
+MISC ChangeLog 2320 RMD160 0895ff5dd6f54f44ba70e79158e8c8d7395ce7b3 SHA1 1313168a4f825cd537c5e6c0203a0c5e217a4977 SHA256 98ed7bc21dcf228ea95a75e4d71f5e26651cff670546f387d8b8aaea0e2b9a9b
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-admin/pulse2-inventory-server/files/pulse2-inventory-server-1.2.4-install-target-1.patch b/app-admin/pulse2-inventory-server/files/pulse2-inventory-server-1.2.4-install-target-1.patch
new file mode 100644
index 0000000..f41561e
--- /dev/null
+++ b/app-admin/pulse2-inventory-server/files/pulse2-inventory-server-1.2.4-install-target-1.patch
@@ -0,0 +1,54 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-05-01
+Initial Package Version: 1.2.4
+Origin: me
+Upstream Status: unknown
+Description: split install target
+ 
+diff -Naur pulse2-inventory-server-1.2.4.orig/Makefile pulse2-inventory-server-1.2.4/Makefile
+--- pulse2-inventory-server-1.2.4.orig/Makefile	2009-01-15 10:12:58.000000000 +0000
++++ pulse2-inventory-server-1.2.4/Makefile	2010-05-01 13:35:35.160870668 +0000
+@@ -52,25 +52,38 @@
+ 	@echo "Nothing to do"
+ 
+ # Install everything
+-install:
++install: install_py install_sbin install_cfg
+ 	@# Install directories
+ 	@echo ""
+ 	@echo "Move old configuration files to $(DESTDIR)$(ETCDIR)$(BACKUP)"
+ 	-[ -f $(DESTDIR)$(ETCDIR)/inventory-server/inventory-server.ini ] && mv -f $(DESTDIR)$(ETCDIR)/inventory-server.ini $(DESTDIR)$(ETCDIR)/inventory-server.ini$(BACKUP)
++
++install_nopy: install_sbin install_cfg
++	@# Install directories
+ 	@echo ""
+-	@echo "Creating directories..."
+-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
+-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
+-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX)
++	@echo "Move old configuration files to $(DESTDIR)$(ETCDIR)$(BACKUP)"
++	# -[ -f $(DESTDIR)$(ETCDIR)/inventory-server/inventory-server.ini ] && mv -f $(DESTDIR)$(ETCDIR)/inventory-server.ini $(DESTDIR)$(ETCDIR)/inventory-server.ini$(BACKUP)
+ 
++install_py:
++	@echo ""
++	@echo "Creating python directories..."
++	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX)
+ 	@echo ""
+ 	@echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)"
+ 	$(PYTHON) setup.py install --no-compile --prefix $(DESTDIR)$(PYTHON_PREFIX)
+ 
++install_sbin:
++	@echo ""
++	@echo "Creating sbin directories..."
++	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
+ 	@echo ""
+ 	@echo "Install SBINFILES in $(DESTDIR)$(SBINDIR)"
+ 	$(INSTALL) $(SBINFILES) -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
+ 
++install_cfg:
++	@echo ""
++	@echo "Creating config directories..."
++	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
+ 	@echo ""
+ 	@echo "Install CONFILES in $(DESTDIR)$(ETCDIR)"
+ 	$(INSTALL) conf/inventory-server/inventory-server.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0-r1.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0-r1.ebuild
deleted file mode 100644
index e1b620e..0000000
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-DESCRIPTION="The pulse2 inventory server and its Python plugins."
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/sqlalchemy-0.5.2
-	>=app-admin/pulse2-common-1.2.0
-	>=app-admin/pulse2-mmc-plugins-1.2.0"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
-}
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0.ebuild
deleted file mode 100644
index fbe596f..0000000
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-DESCRIPTION="The pulse2 inventory server and its Python plugins."
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://mds.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/sqlalchemy-0.5.2
-	>=app-admin/pulse2-common-1.2.0
-	>=app-admin/pulse2-mmc-plugins-1.2.0"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
-}
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
-
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.1_p191.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.1_p191.ebuild
deleted file mode 100644
index 3c17376..0000000
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.1_p191.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="The pulse2 inventory server and its Python plugins."
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/sqlalchemy-0.5.2
-	>=app-admin/pulse2-common-${MY_PV}
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
-}
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.2_p197.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.2_p197.ebuild
deleted file mode 100644
index 3c17376..0000000
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.2_p197.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="The pulse2 inventory server and its Python plugins."
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/sqlalchemy-0.5.2
-	>=app-admin/pulse2-common-${MY_PV}
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
-}
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.3_p210.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.3_p210.ebuild
deleted file mode 100644
index 3c17376..0000000
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.3_p210.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="The pulse2 inventory server and its Python plugins."
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-
-SLOT="0"
-
-RDEPEND=">=dev-python/twisted-web-0.7.0
-	>=dev-python/sqlalchemy-0.5.2
-	>=app-admin/pulse2-common-${MY_PV}
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
-
-	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
-}
diff --git a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221.ebuild b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221-r1.ebuild
similarity index 53%
rename from app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221.ebuild
rename to app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221-r1.ebuild
index 3c17376..2d82491 100644
--- a/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221.ebuild
+++ b/app-admin/pulse2-inventory-server/pulse2-inventory-server-1.2.4_p221-r1.ebuild
@@ -3,8 +3,9 @@
 # $Header: $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils
+inherit eutils distutils
 
 MY_P="${P/_p/-}"
 MY_PV="${PV/_p*/}"
@@ -12,7 +13,7 @@ MY_PV="${PV/_p*/}"
 DESCRIPTION="The pulse2 inventory server and its Python plugins."
 HOMEPAGE="http://pulse2.mandriva.org/"
 SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
+	http://ftp.disconnected-by-peer.at/mds/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
@@ -25,21 +26,15 @@ RDEPEND=">=dev-python/twisted-web-0.7.0
 	>=app-admin/pulse2-common-${MY_PV}
 	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
 
-DEPEND=">=dev-python/setuptools-0.6_rc1"
-
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
-	dosbin bin/pulse2-inventory-server bin/pulse2-inventory-ssl-proxy || die "bin install failed"
-	insinto etc/mmc/pulse2/inventory-server/keys
-	doins -r conf/keys/* || die "key install failed"
-	insinto etc/mmc/pulse2/inventory-server
-	doins -r conf/inventory-server/*.ini || die "ini install failed"
-	insinto usr/share/doc/${P}
-	doins -r contrib || die "config sample install failed"
-	dodoc Changelog
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.4-install-target-1.patch
+	distutils_src_prepare
+}
 
+src_install() {
+	emake install_nopy PREFIX=/usr DESTDIR=${D}
+	distutils_src_install
 	newinitd "${FILESDIR}"/pulse2-inventory-server.initd pulse2-inventory-server
 }