[app-admin/packagekit] Add portage patch, cleanup ebuild a bit

4 files changed, 454 insertions, 24 deletions

diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest
index 61f1ee71a0..cb978c2a35 100644
--- a/app-admin/packagekit/Manifest
+++ b/app-admin/packagekit/Manifest
@@ -1,3 +1,4 @@
+AUX packagekit-0.6.6-portage.patch 15486 RMD160 85a94d81eda41829d37fefe728820a5b9309628d SHA1 62e34e43c4ae58835637b8c0e84670d66806c700 SHA256 5c350301b3338262cc6fe947e12f7f3d6f11e0f66dba77865535796a999ab443
 DIST PackageKit-0.6.6.tar.gz 9401600 RMD160 cf785c21835292abc97ec8a4dfdceaff877f19fb SHA1 4c88dc3efad0b5aac67676fdb6fbc21084e5a75d SHA256 29b5aad5006c287088d14f311a946ed77fce16861f519fbb65a2cd99dff700b1
-EBUILD packagekit-0.6.6.ebuild 4064 RMD160 a117ad9b16b64e8eac8970657745fc65f3aac5de SHA1 505f12bf588a780ac8856c094c36ea5d0f0828f9 SHA256 b13f29b7a65a23e702e3e986c663f4141febd4216b355afaaf86a0370592ec66
-MISC metadata.xml 706 RMD160 1081be74743bb4b9bb6ddcddb917285c79cc4517 SHA1 5056ed8801fb18baf17ae4a3b4908f87df2c74f2 SHA256 5d98e8cf76d5685c7fda80dab7daebb238e63b6ff5edde62f79773d4d03ceae4
+EBUILD packagekit-0.6.6-r1.ebuild 4133 RMD160 829ea034de8e4752132e4ba211c1166e94da6069 SHA1 35d151f515992e42103357abde609423361fcd08 SHA256 d528b2bdf4ccc8cb70a4eb8fe34329b853ee4e40a656bfbf6974ce0c04b028e9
+MISC metadata.xml 518 RMD160 16fe8423974308cb5aada028f4e5539c7303b497 SHA1 bf062ca3e3e364170d7553c281183cfc4cc2b197 SHA256 45d905f5f8d4fec32e74175e373a0e0b7ebcbd0f5f93e6cd1a266c12daa0e548
diff --git a/app-admin/packagekit/files/packagekit-0.6.6-portage.patch b/app-admin/packagekit/files/packagekit-0.6.6-portage.patch
new file mode 100644
index 0000000000..e5366bc54e
--- /dev/null
+++ b/app-admin/packagekit/files/packagekit-0.6.6-portage.patch
@@ -0,0 +1,419 @@
+diff -ru ../PackageKit-0.6.6/backends/entropy/entropyBackend.py ./backends/entropy/entropyBackend.py
+--- ../PackageKit-0.6.6/backends/entropy/entropyBackend.py	2010-06-20 23:38:26.000000000 +0200
++++ ./backends/entropy/entropyBackend.py	2010-07-22 12:04:53.248827967 +0200
+@@ -27,8 +27,8 @@
+ import time
+ import traceback
+ 
+-from packagekit.backend import PackageKitBaseBackend, \
+-    ERROR_PACKAGE_ID_INVALID, ERROR_REPO_NOT_FOUND, ERROR_INTERNAL_ERROR, \
++from packagekit.enums import ERROR_PACKAGE_ID_INVALID, ERROR_REPO_NOT_FOUND, \
++    ERROR_INTERNAL_ERROR, \
+     ERROR_CANNOT_DISABLE_REPOSITORY, ERROR_PACKAGE_FAILED_TO_INSTALL, \
+     ERROR_DEP_RESOLUTION_FAILED, ERROR_PACKAGE_FAILED_TO_CONFIGURE, \
+     ERROR_PACKAGE_FAILED_TO_REMOVE, ERROR_GROUP_LIST_INVALID, \
+@@ -42,13 +42,15 @@
+     GROUP_UNKNOWN, INFO_IMPORTANT, INFO_NORMAL, INFO_DOWNLOADING, \
+     INFO_INSTALLED, INFO_REMOVING, INFO_INSTALLING, \
+     ERROR_INVALID_PACKAGE_FILE, ERROR_FILE_NOT_FOUND, \
+-    INFO_AVAILABLE, get_package_id, split_package_id, MESSAGE_UNKNOWN, \
++    INFO_AVAILABLE, MESSAGE_UNKNOWN, \
+     MESSAGE_AUTOREMOVE_IGNORED, MESSAGE_CONFIG_FILES_CHANGED, STATUS_INFO, \
+     MESSAGE_COULD_NOT_FIND_PACKAGE, MESSAGE_REPO_METADATA_DOWNLOAD_FAILED, \
+     STATUS_QUERY, STATUS_DEP_RESOLVE, STATUS_REMOVE, STATUS_DOWNLOAD, \
+     STATUS_INSTALL, STATUS_RUNNING, STATUS_REFRESH_CACHE, \
+     UPDATE_STATE_TESTING, UPDATE_STATE_STABLE, EXIT_EULA_REQUIRED
+ 
++from packagekit.backend import PackageKitBaseBackend, get_package_id, \
++    split_package_id
+ from packagekit.package import PackagekitPackage
+ 
+ sys.path.insert(0, '/usr/lib/entropy/libraries')
+@@ -59,6 +61,7 @@
+ from entropy.client.interfaces import Client
+ from entropy.core.settings.base import SystemSettings
+ from entropy.misc import LogFile
++from entropy.cache import EntropyCacher
+ from entropy.exceptions import SystemDatabaseError
+ try:
+     from entropy.exceptions import DependenciesNotRemovable
+@@ -768,7 +771,11 @@
+ 
+     def destroy(self):
+         if hasattr(self, "_entropy"):
+-            self._entropy.shutdown()
++            try:
++                self._entropy.shutdown()
++            except NameError:
++                EntropyCacher().stop()
++                self._entropy.destroy()
+ 
+     def __del__(self):
+         self.destroy()
+diff -ru ../PackageKit-0.6.6/backends/portage/portageBackend.py ./backends/portage/portageBackend.py
+--- ../PackageKit-0.6.6/backends/portage/portageBackend.py	2010-05-07 22:08:17.000000000 +0200
++++ ./backends/portage/portageBackend.py	2010-07-22 12:04:49.827380945 +0200
+@@ -20,8 +20,39 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
++import os
++import traceback
++
++
+ # packagekit imports
+-from packagekit.backend import *
++from packagekit.enums import ERROR_PACKAGE_ID_INVALID, ERROR_REPO_NOT_FOUND, \
++    ERROR_INTERNAL_ERROR, ERROR_CANNOT_REMOVE_SYSTEM_PACKAGE, \
++    ERROR_CANNOT_DISABLE_REPOSITORY, ERROR_PACKAGE_FAILED_TO_INSTALL, \
++    ERROR_DEP_RESOLUTION_FAILED, ERROR_PACKAGE_FAILED_TO_CONFIGURE, \
++    ERROR_PACKAGE_FAILED_TO_REMOVE, ERROR_GROUP_LIST_INVALID, \
++    ERROR_UPDATE_NOT_FOUND, ERROR_REPO_CONFIGURATION_ERROR, \
++    ERROR_RESTRICTED_DOWNLOAD, ERROR_PACKAGE_FAILED_TO_BUILD, \
++    ERROR_CANNOT_GET_FILELIST, ERROR_CANNOT_GET_REQUIRES, \
++    ERROR_PACKAGE_ALREADY_INSTALLED, ERROR_PACKAGE_NOT_INSTALLED, \
++    ERROR_PACKAGE_NOT_FOUND, ERROR_MISSING_GPG_SIGNATURE, FILTER_INSTALLED, \
++    FILTER_NOT_INSTALLED, ERROR_GROUP_LIST_INVALID, FILTER_NOT_DEVELOPMENT, \
++    FILTER_FREE, GROUP_ACCESSIBILITY, GROUP_PROGRAMMING, GROUP_GAMES, \
++    FILTER_NOT_FREE, FILTER_NEWEST, \
++    GROUP_DESKTOP_GNOME, GROUP_DESKTOP_KDE, GROUP_DESKTOP_OTHER, \
++    GROUP_MULTIMEDIA, GROUP_NETWORK, GROUP_OFFICE, GROUP_SCIENCE, \
++    GROUP_SYSTEM, GROUP_SECURITY, GROUP_OTHER, GROUP_DESKTOP_XFCE, \
++    GROUP_UNKNOWN, INFO_IMPORTANT, INFO_NORMAL, INFO_DOWNLOADING, \
++    INFO_INSTALLED, INFO_REMOVING, INFO_INSTALLING, INFO_SECURITY, \
++    ERROR_INVALID_PACKAGE_FILE, ERROR_FILE_NOT_FOUND, \
++    INFO_AVAILABLE, MESSAGE_UNKNOWN, \
++    MESSAGE_AUTOREMOVE_IGNORED, MESSAGE_CONFIG_FILES_CHANGED, STATUS_INFO, \
++    MESSAGE_COULD_NOT_FIND_PACKAGE, MESSAGE_REPO_METADATA_DOWNLOAD_FAILED, \
++    STATUS_QUERY, STATUS_DEP_RESOLVE, STATUS_REMOVE, STATUS_DOWNLOAD, \
++    STATUS_INSTALL, STATUS_RUNNING, STATUS_REFRESH_CACHE, \
++    UPDATE_STATE_TESTING, UPDATE_STATE_STABLE, EXIT_EULA_REQUIRED
++
++from packagekit.backend import PackageKitBaseBackend, \
++    get_package_id, split_package_id
+ from packagekit.progress import *
+ from packagekit.package import PackagekitPackage
+ 
+@@ -546,7 +577,7 @@
+ 
+         return cpv_dict
+ 
+-    def _filter_free(self, cpv_list, fltlist):
++    def _filter_free(self, cpv_list, filters):
+         if not cpv_list:
+             return cpv_list
+ 
+@@ -554,11 +585,11 @@
+             metadata = self._get_metadata(cpv, ["LICENSE", "USE", "SLOT"], True)
+             return not self.pvar.settings._getMissingLicenses(cpv, metadata)
+ 
+-        if FILTER_FREE in fltlist or FILTER_NOT_FREE in fltlist:
++        if FILTER_FREE in filters or FILTER_NOT_FREE in filters:
+             free_licenses = "@FSF-APPROVED"
+-            if FILTER_FREE in fltlist:
++            if FILTER_FREE in filters:
+                 licenses = "-* " + free_licenses
+-            elif FILTER_NOT_FREE in fltlist:
++            elif FILTER_NOT_FREE in filters:
+                 licenses = "* -" + free_licenses
+             backup_license = self.pvar.settings["ACCEPT_LICENSE"]
+ 
+@@ -576,14 +607,14 @@
+ 
+         return cpv_list
+ 
+-    def _filter_newest(self, cpv_list, fltlist):
++    def _filter_newest(self, cpv_list, filters):
+         if len(cpv_list) == 0:
+             return cpv_list
+ 
+-        if FILTER_NEWEST not in fltlist:
++        if FILTER_NEWEST not in filters:
+             return cpv_list
+ 
+-        if FILTER_INSTALLED in fltlist:
++        if FILTER_INSTALLED in filters:
+             # we have one package per slot, so it's the newest
+             return cpv_list
+ 
+@@ -598,7 +629,7 @@
+ 
+         for k in slots:
+             # if not_intalled on, no need to check for newest installed
+-            if FILTER_NOT_INSTALLED not in fltlist:
++            if FILTER_NOT_INSTALLED not in filters:
+                 newest_installed = self._get_newest_cpv(cpv_dict[k], True)
+                 if newest_installed != "":
+                     cpv_list.append(newest_installed)
+@@ -608,7 +639,7 @@
+ 
+         return cpv_list
+ 
+-    def _get_all_cp(self, fltlist):
++    def _get_all_cp(self, filters):
+         # NOTES:
+         # returns a list of cp
+         #
+@@ -618,9 +649,9 @@
+         # - newest: ok (should be finished with cpv)
+         cp_list = []
+ 
+-        if FILTER_INSTALLED in fltlist:
++        if FILTER_INSTALLED in filters:
+             cp_list = self.pvar.vardb.cp_all()
+-        elif FILTER_NOT_INSTALLED in fltlist:
++        elif FILTER_NOT_INSTALLED in filters:
+             cp_list = self.pvar.portdb.cp_all()
+         else:
+             # need installed packages first
+@@ -631,7 +662,7 @@
+ 
+         return cp_list
+ 
+-    def _get_all_cpv(self, cp, fltlist, filter_newest=True):
++    def _get_all_cpv(self, cp, filters, filter_newest=True):
+         # NOTES:
+         # returns a list of cpv
+         #
+@@ -643,9 +674,9 @@
+         cpv_list = []
+ 
+         # populate cpv_list taking care of installed filter
+-        if FILTER_INSTALLED in fltlist:
++        if FILTER_INSTALLED in filters:
+             cpv_list = self.pvar.vardb.match(cp)
+-        elif FILTER_NOT_INSTALLED in fltlist:
++        elif FILTER_NOT_INSTALLED in filters:
+             for cpv in self.pvar.portdb.match(cp):
+                 if not self._is_installed(cpv):
+                     cpv_list.append(cpv)
+@@ -656,11 +687,11 @@
+                     cpv_list.append(cpv)
+ 
+         # free filter
+-        cpv_list = self._filter_free(cpv_list, fltlist)
++        cpv_list = self._filter_free(cpv_list, filters)
+ 
+         # newest filter
+         if filter_newest:
+-            cpv_list = self._filter_newest(cpv_list, fltlist)
++            cpv_list = self._filter_newest(cpv_list, filters)
+ 
+         return cpv_list
+ 
+@@ -852,8 +883,6 @@
+         self.allow_cancel(True)
+         self.percentage(None)
+ 
+-        fltlist = filters.split(';')
+-
+         cpv_input = []
+         cpv_list = []
+ 
+@@ -913,9 +942,9 @@
+         cpv_list = filter(_filter_uninstall, cpv_list)
+ 
+         # install filter
+-        if FILTER_INSTALLED in fltlist:
++        if FILTER_INSTALLED in filters:
+             cpv_list = filter(_filter_installed, cpv_list)
+-        if FILTER_NOT_INSTALLED in fltlist:
++        if FILTER_NOT_INSTALLED in filters:
+             cpv_list = filter(_filter_not_installed, cpv_list)
+ 
+         # now we can change cpv_list to a real cpv list
+@@ -926,7 +955,7 @@
+         del tmp_list
+ 
+         # free filter
+-        cpv_list = self._filter_free(cpv_list, fltlist)
++        cpv_list = self._filter_free(cpv_list, filters)
+ 
+         for cpv in cpv_list:
+             # prevent showing input packages
+@@ -1001,13 +1030,12 @@
+         self.allow_cancel(True)
+         self.percentage(0)
+ 
+-        fltlist = filters.split(';')
+-        cp_list = self._get_all_cp(fltlist)
++        cp_list = self._get_all_cp(filters)
+         nb_cp = float(len(cp_list))
+         cp_processed = 0.0
+ 
+-        for cp in self._get_all_cp(fltlist):
+-            for cpv in self._get_all_cpv(cp, fltlist):
++        for cp in self._get_all_cp(filters):
++            for cpv in self._get_all_cpv(cp, filters):
+                 self._package(cpv)
+ 
+             cp_processed += 100.0
+@@ -1024,8 +1052,6 @@
+         self.allow_cancel(True)
+         self.percentage(None)
+ 
+-        fltlist = filters.split(';')
+-
+         # get installed and available dbs
+         installed_layman_db = layman.db.DB(layman.config.Config())
+         available_layman_db = layman.db.RemoteDB(layman.config.Config())
+@@ -1033,7 +1059,7 @@
+         # 'gentoo' is a dummy repo
+         self.repo_detail('gentoo', 'Gentoo Portage tree', True)
+ 
+-        if FILTER_NOT_DEVELOPMENT not in fltlist:
++        if FILTER_NOT_DEVELOPMENT not in filters:
+             for o in available_layman_db.overlays.keys():
+                 if available_layman_db.overlays[o].is_official() \
+                         and available_layman_db.overlays[o].is_supported():
+@@ -1052,12 +1078,10 @@
+         self.allow_cancel(True)
+         self.percentage(None)
+ 
+-        fltlist = filters.split(';')
+-
+         cpv_input = []
+         cpv_list = []
+ 
+-        if FILTER_NOT_INSTALLED in fltlist:
++        if FILTER_NOT_INSTALLED in filters:
+             self.error(ERROR_CANNOT_GET_REQUIRES,
+                     "get-requires returns only installed packages at the moment")
+             return
+@@ -1085,7 +1109,7 @@
+         del packages_list
+ 
+         # free filter
+-        cpv_list = self._filter_free(cpv_list, fltlist)
++        cpv_list = self._filter_free(cpv_list, filters)
+ 
+         for cpv in cpv_list:
+             # prevent showing input packages
+@@ -1147,8 +1171,6 @@
+         self.allow_cancel(True)
+         self.percentage(None)
+ 
+-        fltlist = filters.split(';')
+-
+         update_candidates = []
+         cpv_updates = {}
+         cpv_downgra = {}
+@@ -1203,12 +1225,12 @@
+                         else:
+                             dict_down[s] = [tmp_list_avai.pop()]
+ 
+-                cpv_list_updates = self._filter_free(cpv_list_updates, fltlist)
++                cpv_list_updates = self._filter_free(cpv_list_updates, filters)
+ 
+                 if len(cpv_list_updates) == 0:
+                     break
+ 
+-                if FILTER_NEWEST in fltlist:
++                if FILTER_NEWEST in filters:
+                     best_cpv = portage.versions.best(cpv_list_updates)
+                     cpv_list_updates = [best_cpv]
+ 
+@@ -1539,8 +1561,7 @@
+         self.allow_cancel(True)
+         self.percentage(0)
+ 
+-        fltlist = filters.split(';')
+-        cp_list = self._get_all_cp(fltlist)
++        cp_list = self._get_all_cp(filters)
+         nb_cp = float(len(cp_list))
+         cp_processed = 0.0
+ 
+@@ -1554,7 +1575,7 @@
+ 
+         for cp in cp_list:
+             if s.match(cp):
+-                for cpv in self._get_all_cpv(cp, fltlist):
++                for cpv in self._get_all_cpv(cp, filters):
+                     self._package(cpv)
+ 
+             cp_processed += 100.0
+@@ -1568,8 +1589,7 @@
+         self.allow_cancel(True)
+         self.percentage(0)
+ 
+-        fltlist = filters.split(';')
+-        cp_list = self._get_all_cp(fltlist)
++        cp_list = self._get_all_cp(filters)
+         nb_cp = float(len(cp_list))
+         cp_processed = 0.0
+         search_list = self._get_search_list(keys)
+@@ -1582,7 +1602,7 @@
+             # newest filter can't be executed now
+             # because some cpv are going to be filtered by search conditions
+             # and newest filter could be alterated
+-            for cpv in self._get_all_cpv(cp, fltlist, filter_newest=False):
++            for cpv in self._get_all_cpv(cp, filters, filter_newest=False):
+                 match = True
+                 metadata =  self._get_metadata(cpv,
+                         ["DESCRIPTION", "HOMEPAGE", "IUSE",
+@@ -1603,7 +1623,7 @@
+                     cpv_list.append(cpv)
+ 
+             # newest filter
+-            cpv_list = self._filter_newest(cpv_list, fltlist)
++            cpv_list = self._filter_newest(cpv_list, filters)
+ 
+             for cpv in cpv_list:
+                 self._package(cpv)
+@@ -1622,9 +1642,7 @@
+         self.allow_cancel(True)
+         self.percentage(0)
+ 
+-        fltlist = filters.split(';')
+-
+-        if FILTER_NOT_INSTALLED in fltlist:
++        if FILTER_NOT_INSTALLED in filters:
+             self.error(ERROR_CANNOT_GET_FILELIST,
+                     "search-file isn't available with ~installed filter")
+             return
+@@ -1640,7 +1658,7 @@
+             searchre = re.compile("/" + key + "$", re.IGNORECASE)
+ 
+         # free filter
+-        cpv_list = self._filter_free(cpv_list, fltlist)
++        cpv_list = self._filter_free(cpv_list, filters)
+         nb_cpv = float(len(cpv_list))
+ 
+         for cpv in cpv_list:
+@@ -1661,15 +1679,14 @@
+         self.allow_cancel(True)
+         self.percentage(0)
+ 
+-        fltlist = filters.split(';')
+-        cp_list = self._get_all_cp(fltlist)
++        cp_list = self._get_all_cp(filters)
+         nb_cp = float(len(cp_list))
+         cp_processed = 0.0
+ 
+         for cp in cp_list:
+             for group in groups:
+                 if self._get_pk_group(cp) == group:
+-                    for cpv in self._get_all_cpv(cp, fltlist):
++                    for cpv in self._get_all_cpv(cp, filters):
+                         self._package(cpv)
+ 
+             cp_processed += 100.0
+@@ -1707,8 +1724,7 @@
+             k = re.escape(k)
+             search_list.append(re.compile(k, re.IGNORECASE))
+ 
+-        fltlist = filters.split(';')
+-        cp_list = self._get_all_cp(fltlist)
++        cp_list = self._get_all_cp(filters)
+         nb_cp = float(len(cp_list))
+         cp_processed = 0.0
+ 
+@@ -1727,7 +1743,7 @@
+                     found = False
+                     break
+             if found:
+-                for cpv in self._get_all_cpv(cp, fltlist):
++                for cpv in self._get_all_cpv(cp, filters):
+                     self._package(cpv)
+ 
+             cp_processed += 100.0
diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
index 2201619397..b4647881e6 100644
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@@ -9,10 +9,7 @@
 	<use>
 		<flag name="connman">Add support for <pkg>net-misc/connman</pkg></flag>
 		<flag name="cron">Install cron script for auto-update</flag>
-		<flag name="portage">Enable Portage backend</flag>
-		<flag name="entropy">Enable Entropy backend (Sabayon system pkg)</flag>
 		<flag name="pm-utils">Use pm-utils</flag>
-		<!--flag name="ruck">Build ruck (rug-like) client</flag-->
 		<flag name="udev">Add support for <pkg>sys-fs/udev</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/packagekit/packagekit-0.6.6.ebuild b/app-admin/packagekit/packagekit-0.6.6-r1.ebuild
index c11e8c87c8..fa8f96f1bb 100644
--- a/app-admin/packagekit/packagekit-0.6.6.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.6-r1.ebuild
@@ -66,21 +66,23 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	>=app-portage/layman-1.2.3
+	>=sys-apps/portage-2.2_rc67
 	pm-utils? ( sys-power/pm-utils )
 "
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-portage.patch"
+)
+
 # NOTES:
-# do not use a specific user, useless and not more secure according to upstream
-# doc is in the tarball and always installed
 # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
 #	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
 
 # TODO:
 # +doc to install doc/website
 # check if test? qt? ( really needs qt-gui)
-# determine supported portage version
 
 # UPSTREAM:
 # documentation/website with --enable-doc-install
@@ -100,19 +102,21 @@ src_configure() {
 	# gtk-doc: doc already built
 	# command,debuginfo,gstreamer,service-packs: not supported by backend
 	myeconfargs=(
-		--localstatedir=/var
-		--enable-option-checking
-		--enable-libtool-lock
-		--disable-strict
-		--disable-local
-		--disable-gtk-doc
+		--localstatedir="/var"
 		--disable-command-not-found
 		--disable-debuginfo-install
+		--disable-dummy
+		--disable-gtk-doc
 		--disable-gstreamer-plugin
-		--disable-service-packs
+		--disable-local
 		--disable-managed
+		--disable-service-packs
+		--disable-strict
+		--disable-tests
+		--enable-introspection
+		--enable-libtool-lock
 		--enable-man-pages
-		--disable-dummy
+		--enable-option-checking
 		--enable-portage
 		--with-default-backend=portage
 		$(use_enable connman)
@@ -123,7 +127,6 @@ src_configure() {
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable pm-utils)
 		$(use_enable qt4 qt)
-		$(use_enable test tests)
 		$(use_enable udev device-rebind)
 	)
 
@@ -140,15 +143,25 @@ src_install() {
 	autotools-utils_src_install
 
 	if use nsplugin; then
-		src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
+		src_mv_plugins "/usr/$(get_libdir)/mozilla/plugins"
 	fi
 
-	# Remove precompiled python modules, we handle byte compiling
-	rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
+	python_convert_shebangs -q -r $(python_get_version) "${D}"
+	python_clean_installation_image -q
+}
+
+src_test() {
+	myeconfargs+=(
+		--enable-tests
+	)
+
+	autotools-utils_src_configure
+	autotools-utils_src_compile
+	autotools-utils_src_test
 }
 
 pkg_postinst() {
-	python_mod_optimize "$(python_get_sitedir)/${PN}"
+	python_mod_optimize -q "$(python_get_sitedir)/${PN}"
 
 	if ! use policykit; then
 		ewarn "You are not using policykit, the daemon can't be considered as secure."
@@ -163,10 +176,10 @@ pkg_postinst() {
 
 pkg_prerm() {
 	einfo "Removing downloaded files with ${MY_PN}..."
-	[[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
-		rm -rf /var/cache/PackageKit/downloads/*
+	[[ -d "${ROOT}/var/cache/${MY_PN}/downloads" ]] && \
+		rm -rf "${ROOT}/var/cache/${MY_PN}/downloads"/*
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
+	python_mod_cleanup -q "$(python_get_sitedir)/${PN}"
 }