bzr: Update recipe

Untested yet, but it builds.
Only for gcc2 for now, since we don't have a python package
for secondary arch yet, and it needs to use libpython.so...

dev-vcs/bzr/bzr-2.6.0.recipe

@@ -13,7 +13,15 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2013 Canonical"
 
-ARCHITECTURES="!x86 !x86_gcc2 !x86_64"
+ARCHITECTURES="?x86_gcc2 !x86 !x86_64"
+#if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+#	# x86_gcc2 is fine as primary target architecture as long as we're building
+#	# for a different secondary architecture.
+#	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+#else
+#	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+#fi
+SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
 	bzr = $portVersion compat >= 2.6.0
@@ -22,20 +30,28 @@ PROVIDES="
 
 REQUIRES="
 	haiku >= $haikuVersion
+	lib:libpython2.6$secondaryArchSuffix
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libpython2.6$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
 	cmd:python
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:msgfmt
 	"
 
 SOURCE_DIR="bzr-$portVersion"
 
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+	PATCHES="bzr-2.6.0_gcc2.patchset"
+fi
+
 BUILD()
 {
 	python setup.py build