diff --git a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.6.recipe b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.6.recipe
index 130306a32..d805c41a9 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.6.recipe
+++ b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.6.recipe
@@ -11,27 +11,21 @@ The main goals of libtorrent are:
  * to be memory efficient
  * to be very easy to use"
 HOMEPAGE="http://www.libtorrent.org/"
+COPYRIGHT="2003-2015 Arvid Norberg"
+LICENSE="BSD (2-clause)"
 SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_0_6/libtorrent-rasterbar-$portVersion.tar.gz"
 SOURCE_DIR="libtorrent-rasterbar-$portVersion"
 CHECKSUM_SHA256="c97de804b77f44591801631aca3869567671df2d3e2afe7f5453d8db2478fd61"
+PATCHES="libtorrent_rasterbar_x86-1.0.6.patchset"
 REVISION="1"
 
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2015 Arvid Norberg"
-
-ARCHITECTURES="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"
-fi
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
 
 PROVIDES="
 	libtorrent_rasterbar${secondaryArchSuffix} = $portVersion
-	lib:libtorrent_rasterbar$secondaryArchSuffix
+	lib:libtorrent_rasterbar$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix
@@ -41,13 +35,20 @@ REQUIRES="
 	lib:libssl$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	libtorrent_rasterbar${secondaryArchSuffix}_devel = $portVersion
+	devel:libtorrent_rasterbar$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libtorrent_rasterbar$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -56,10 +57,9 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	"
 
-PATCHES="libtorrent_rasterbar_x86-1.0.6.patchset"
-
 BUILD()
 {
+	# this CMake setup does not use GNUInstallDirs
 	cmake .
 	make $jobArgs
 }
@@ -69,26 +69,14 @@ INSTALL()
 	mkdir -p $includeDir $libDir
 	make install
 
-	# this CMake setup does not use GNUInstallDirs
 	mv $prefix/include/libtorrent $includeDir
 	mv $prefix/lib/*.so* $libDir
 	mv $prefix/lib/pkgconfig $libDir
 	rm -r $prefix/include
 	
-	# prepare develop/lib
 	prepareInstalledDevelLib libtorrent-rasterbar
 	fixPkgconfig
 
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libtorrent_rasterbar${secondaryArchSuffix}_devel = $portVersion
-	devel:libtorrent_rasterbar$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libtorrent_rasterbar$secondaryArchSuffix == $portVersion base
-	"