Merge branch 'master' of git://git.ipfire.org/oddments/pakfire into server

Conflicts:
	pakfire/packages/base.py

diff --cc pakfire/__init__.py
Simple merge

diff --cc pakfire/builder.py
Simple merge

diff --cc pakfire/cli.py
Simple merge

diff --cc pakfire/packages/base.py
index baea8ed97601ea1965356fefb5dc50a873f58a3d,777bc9989e4b27a6c31d2e9ec48a6dbdacad3c25..a1df3e6eee925e8881170af03b5e8dd259bdbce4
--- 1/pakfire/packages/base.py
--- 2/pakfire/packages/base.py
+++ b/pakfire/packages/base.py
@@@ -282,9 -288,23 +288,26 @@@ class Package(object)
                return self.metadata.get("PKG_UUID", None)
  
        @property
 +      def supported_arches(self):
 +              return self.metadata.get("PKG_SUPPORTED_ARCHES", "all")
 +
+       def requires(self):
+               ret = ""
+ 
+               # The default attributes, that are process for the requires.
+               attrs = ("PKG_REQUIRES", "PKG_DEPS")
+ 
+               # Source packages do depend on their build dependencies.
+               if self.arch == "src":
+                       attrs = ("PKG_BUILD_DEPS",)
+ 
+               for i in attrs:
+                       ret = self.metadata.get(i, ret)
+                       if ret:
+                               break
+ 
+               return set(ret.split())
+ 
        @property
        def _provides(self):
                # Make package identifyable by its name and version/release tuples.

diff --cc pakfire/packages/packager.py
Simple merge

diff --cc pakfire/repository/__init__.py
Simple merge

diff --cc pakfire/repository/local.py
Simple merge

diff --cc pakfire/util.py
Simple merge