Workaround quirk with b2 package.install being called for many targets

2 files changed, 18 insertions, 9 deletions

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index 6cb2ae0..4e71d03 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -2,9 +2,9 @@ DIST project2-1.0.1.tar.bz2 150961 SHA256 954235041641cea7d9b68a405a54f45b439df6
 DIST project2-1.0.2.tar.bz2 152746 SHA256 2e3886609e7b21df467c6957fab0febd3b3d4ce73dd32a1a2e5b9093142b6f2c SHA512 10bb247cddc90065921406b0db3260a421a341deeaf3bdb25762ab5bee65ed763659fe5991f644b3b09c3d1f55a301457729b4d75f397a990592e902ad8360e4 WHIRLPOOL 2240a5fa422756c497f193304fa052f923136f30116f25acd043734f1ef3f46a158edc37e5d532364ec4a5101e496e36a7f0585991e6421d17fcd63cad317a5c
 DIST project2-1.0.3.tar.bz2 150663 SHA256 28f5dbb920b0202fc70395044931e87f08dface8bf51b1f3e138522d123cc9eb SHA512 c5533dd430ed0868408de644868957378bb1d02cf471d4232cc5b90c3034af2bb5309f732c980f4bd2bf308fdc8737191103c228ab004efe1af109ddf3ffe716 WHIRLPOOL 73f7a41c286c8d48ed68de0bbd1cff70a4a8ff77f9a6fbf5538ed24089ce6d14a5436298230b59d6612baaa1b72e8cf3e41adbde9f7151b2aa5fc27057bb202f
 DIST project2-1.1.1.tar.bz2 157049 SHA256 086edc59c5fadc91562648ae2e3f05898cc46b0b7b01c64e0926c586e14df61f SHA512 b5f79db95bf6bcff78d24137854366511359b2b2279ad9def8dcc5d913c32944ee8d958b8fcb58cc4e95fee236b63b39e3b2b953c0c6d3430b3500b8b35a4a84 WHIRLPOOL db0c507091893faa6634cc88359f461c3fb89909086802954ef916460109aa027f0fac9122055df2fde1ca07741511ef6161b589a80161d65d587ec170b67705
-DIST project2-1.1.2.tar.bz2 158331 SHA256 7153bd4b6b91c4cb036b0850f3f1fc73f33c41d19eec3c76d10706c3109e7227 SHA512 79e6282898810a61636f834b3f4730cf1039e4c5201916006880fe565a73c596443878ef8ff455311cf61c8622cfb409b2900fa4688d0f0094e74a2972ac4f0c WHIRLPOOL ff1ad574c1cd8b25e931ccdb0d30883fea4e142e5d915117b49454c2c8f6f8c5c102d6536681791f89df5060c1d401dc58653af46d3f730a396a1257b0b9cfe0
+DIST project2-1.1.2.1.tar.bz2 158380 SHA256 51fbc78579368966883ce90758b0c6429b44cb61f808a00b2e8f0d33483eb64e SHA512 e2a686568c1b1b11d69cd978d98003eb177b54a2a64089fd4659b341f766b497980c39cc045645f27597a9152b8ce9b3e3a20e2c7e3ec1fdccc43e6b1ed8adfe WHIRLPOOL f63ddf32defaa91649d302318249f4eb2d0271efc8d15712e9319a01cba0b76102689bc127a71e6a6a8a1516fd8bb52e295232f3467f98a9be5afcf71a4d64de
 EBUILD project2-1.0.1.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
 EBUILD project2-1.0.2.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
 EBUILD project2-1.0.3.ebuild 2018 SHA256 930d7a58b95376ae53d607327962b306617cdcffb5693707b124fbc8b7fd2fa8 SHA512 45b2224b404bc79853365c2926830e6076a04b56f7fb4fd3c596158264ef95b9018f23f9044d242761f574b6574c15d6df0e88019930ad1c745320940df98c3e WHIRLPOOL 6f068038655a8b12dab2fd5b4e2ce527f3d4d8cd3415a1b61131c84313b49ecae7ecabccb461da4d903ea987e0205b20f6b097552e90ebdcda56bf2a90d9706e
 EBUILD project2-1.1.1.ebuild 2052 SHA256 d4375605c4424526fddd6ff8d57b5024d9c82db0282cce1c2887b64c49dd8a29 SHA512 c4f2c888a27448ccddb8dcad7ddb6625c03c80c6569b9ef787a84ac2e6ec6d3c9bece4553111e7555233b0b39e73fe28f4fe7abdbde37f91081060a3cc851f15 WHIRLPOOL cc29e5f6cb342ce0e6cdcaebf34b79cbc9739c811b1e910b08afb25b0f5b5dd5c4566af92e9b37da7d620667f55370b0963eb86bbe09a4244fae81ba10648588
-EBUILD project2-1.1.2.ebuild 2113 SHA256 9f4ad7f7b03d330d0d6a34cf8c92ad300f8a04ca212e794d9d4b463ed9c372b3 SHA512 c55f3a238680dc89f012a0bc962f4937c3bdab9be6b3f4b362c6257133b57c499c47cd5a3ebfa210ed91d8a7066b5d98a79f8888d33dbbb8b007efc62b77b5af WHIRLPOOL 641f3553737580460b4d6602c5348cf6a7e3f8c1f12ae6976885aedb16ae3e282a374db8681f7cf1916cffe8484620ea002df04ac872b42fbe314980cc823dc5
+EBUILD project2-1.1.2.1.ebuild 2178 SHA256 dfbe7fb93bdbe3b8cb213417d961692afb48cb541f0b4a7ad5b32ff6265b3882 SHA512 2669f83821e27a162572db67bff7cb6fb013ef67da2a4dfc8982165460841088a389f2b9ddf03eec17036f4940c6069de4e940206676487fecd726dba128cf19 WHIRLPOOL e75a413e590390835ed0bbd6974f7bac36ecb186c51c889c7315c51d9f24fd5709ea89ae60c278729c5fb88796d4884415ab4878f11667231e61aac0326b8d13
diff --git a/www-apps/project2/project2-1.1.2.ebuild b/www-apps/project2/project2-1.1.2.1.ebuild
index 53ade47..1fb95bd 100644
--- a/www-apps/project2/project2-1.1.2.ebuild
+++ b/www-apps/project2/project2-1.1.2.1.ebuild
@@ -39,27 +39,36 @@ use !odbc && opts+=" odbc=no"
 use !mysql && opts+=" mysql=no"
 use !postgres && opts+=" pq=no"
 use !sqlite && opts+=" sqlite=no"
-use unittest && bt="$bt ut" && it="$it installp2ut"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-use daemon && bt="$bt p2daemon" && it="$it installp2daemon"
 
 src_prepare() {
 	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
 }
 
+src_configure() {
+	(
+		echo "alias finalbin : "
+		use console && echo " console//p2console "
+		use web && echo " cgi//p2cgi "
+		use web && use fastcgi && echo " cgi//p2fcgi "
+		use daemon && echo " daemon//p2daemon "
+		echo " ; "
+		echo "alias finallib : "
+		use unittest && echo " ut//p2ut "
+		echo " ; "
+	) >> ${S}/project2/Jamfile.jam
+}
+
 src_compile() {
 	cd ${S}/project2 || die
 	setarch $(uname -m) -RL \
-			b2 ${BJAMOPTS} ${opts} ${bt} -q \
+			b2 ${BJAMOPTS} ${opts} finalbin finallib -q \
 			|| die "Compile failed"
 }
 
 src_install() {
 	cd ${S}/project2 || die
 	setarch $(uname -m) -RL \
-			b2 ${BJAMOPTS} ${opts} ${it} -q \
+			b2 ${BJAMOPTS} ${opts} install -q \
 			--prefix=${D}/usr \
 			|| die "Installed failed"
 	b2 installheaders --includedir=${D}/usr/include/project2 || die "Install headers failed"