libxo, disable x86_gcc2, move config to develop package, move cmd's to tools package (#6455)

dev-libs/libxo/libxo-1.6.0.recipe

@@ -5,24 +5,26 @@ decides at run time which output style should be produced."
 HOMEPAGE="https://github.com/Juniper/libxo"
 COPYRIGHT="2014 Juniper Networks, Inc."
 LICENSE="BSD (2-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/Juniper/libxo/releases/download/$portVersion/libxo-$portVersion.tar.gz"
 CHECKSUM_SHA256="9f2f276d7a5f25ff6fbfc0f38773d854c9356e7f985501627d0c0ee336c19006"
 PATCHES="libxo-$portVersion.patchset"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 libVersion="0.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxo$secondaryArchSuffix = $portVersion
-	cmd:libxo_config = $libVersionCompat
-	cmd:xo = $libVersionCompat
-	cmd:xohtml = $libVersionCompat
-	cmd:xolint = $libVersionCompat
-	cmd:xopo = $libVersionCompat
 	lib:libxo$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -33,6 +35,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libxo${secondaryArchSuffix}_devel = $portVersion
+	cmd:libxo_config$commandSuffix = $libVersionCompat
 	devel:libxo$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
@@ -41,13 +44,26 @@ REQUIRES_devel="
 	devel:libintl$secondaryArchSuffix
 	"
 
+PROVIDES_tools="
+	libxo${secondaryArchSuffix}_tools = $portVersion
+	cmd:xo$commandSuffix = $libVersionCompat
+	cmd:xohtml$commandSuffix = $libVersionCompat
+	cmd:xolint$commandSuffix = $libVersionCompat
+	cmd:xopo$commandSuffix = $libVersionCompat
+	"
+REQUIRES_tools="
+	libxo$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}
+	lib:libintl$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:msgfmt
+	cmd:msgfmt$secondaryArchSuffix
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -61,7 +77,9 @@ defineDebugInfoPackage libxo$secondaryArchSuffix \
 
 BUILD()
 {
-	LDFLAGS="-lbsd -lnetwork" CFLAGS="-D_DEFAULT_SOURCE" runConfigure ./configure
+	LDFLAGS="-lbsd -lnetwork" CFLAGS="-D_DEFAULT_SOURCE" \
+		runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir
 	make $jobArgs
 }
 
@@ -70,13 +88,18 @@ INSTALL()
 	make install
 
 	rm -rf $libDir/libxo.la
+	rm -rf $libDir/libxo/encoder/*.la
 
-	prepareInstalledDevelLibs \
+	prepareInstalledDevelLib \
 		libxo
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir \
+		$commandBinDir/libxo-config \
+		$developDir
+	packageEntries tools \
+		$commandBinDir \
+		$dataDir \
 		$manDir
 }