Purge old, fix install paths adhocutil

15 files changed, 7 insertions, 717 deletions

diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest
index 04d5fae..e11d499 100644
--- a/dev-libs/libadhocutil/Manifest
+++ b/dev-libs/libadhocutil/Manifest
@@ -1,28 +1,4 @@
-DIST libadhocutil-0.1.tar.bz2 18457 SHA256 2ef7048932fbd99b264d1e1a8280ea5093c2498086218a1197376b9c316de256 SHA512 b7a888b894b508bac44a56fbda959037f6ef19d71c1a64d40e1adcee71836cc9f79a6a6ea41a0866fe75fcc7dc25178828934dc656aaf0ad3bf45d74cd37f406 WHIRLPOOL 035256c84dad4670655f594445fa18f40ac5cff374ac78c82a8db75674b3431b7d072fbaf32ec921f3ab4c55b04ef56b714339df7d8ac07f96e230be8248aecb
-DIST libadhocutil-0.2.1.tar.bz2 24008 SHA256 c7d2977111c0cffa214bff12fce905ca4f763c61489734e7b77f242c0c44876f SHA512 ac61b6c40f2f1e4c20f0a55f45a5d6229469e97072a0d1dcee41687a6c2f369114e6478c8c4e6277a06c11c18cb6b603d51111dd3eea00ddee5a101a7a004112 WHIRLPOOL e37f67bf29a57a901d0b24c2008c04ddd35a70364d98f736477ba85a3b4805ed5e154161f70515d4e3377f117e8d50ea44fdbf0d448d1bf520ef0ad3299349cf
-DIST libadhocutil-0.2.tar.bz2 23057 SHA256 27952b9636205c3e7b56a264600f28a2697f2f90206529eea81349c423317f67 SHA512 5af2fe1981b023898fb128e74f4908e2c70262f1a653e58b57085b534a773166ee4cecbf8a661aad679fa69cfae9a8d6208c682f41863b1a13cd4bfd3eb9d2b6 WHIRLPOOL ef53b861d51680a22eac78023456e4b0196c8f99b1e7920f2cae41c769809a31bc0f0f1854f95ecab079877046498c263791956cca7ed3f79c00c8029f5ed9bd
-DIST libadhocutil-0.3.1.tar.bz2 28144 SHA256 fe780c0ebe4c73d7bd3afbe4f74ce3e66f9ebcb6f1d4e4ba01fa752d4ed77a2d SHA512 cf588def22cf9b06878702a046f6a166d29b623d1d6cb8833e0afc956263ee58afe9573b81f296c64bec7003e1dc6b11cee50bf6d84b704f1061ee01839805f4 WHIRLPOOL 8a548b0e5874b47a47ce04f45cf72a11a613b10801e84e229eb2461f8b66001f6342a56e4ecef069c65c629b685fbfd66e6cb131c52e48656ad7cef44d72e5e7
-DIST libadhocutil-0.3.2.tar.bz2 28684 SHA256 2e7f77120a13aa1ec8fb792fd672689c405fbd28271e45216430a7b34b9ad4cf SHA512 1fbdef4092685658c87daae8d19806e73332e022f416918596709cbee2233bec04da9f7427f20dbd43cfd8e88108dee2e79d2ed965c0f760c5e915da315d3741 WHIRLPOOL 2744d6d71c98e46afc18e1383f2d8c29e79fbd62bd7a57b8ebad77a97b82298d38d7b4c5c3bc8fee6bb8ff574217fb3500dde502805cd18625def26a68dc755b
-DIST libadhocutil-0.3.4.tar.bz2 29178 SHA256 d987d150b9109c77946e878204f365b79ab05adbc9efba275f8f86ca3a9001c5 SHA512 816e086eca23b2b0591b711aad710b181f2f8ec43efc790e29fcef05732b29c62c1333f1d0e3afcf1f641125d915e7d5f05b498280a07afd96f88a25c7d3da6d WHIRLPOOL 4ef5119c409db7112a40e6565efdb1c3673ca1e6a0a446cb6c93d0a743db0de00826f4f2c645bb6133b245684cf7a5fc83b233bb1f89e8172fc46b21c0b1d689
-DIST libadhocutil-0.3.5.tar.bz2 30921 SHA256 02bba62c7353ed07c8ce9282da09cf4686d3fd47c479dc4e29f794ce30e65ce8 SHA512 c0554b239bf8f01067fe906933c311ad043bcd284067f75a3c3bf529abbf098440cd5ba3497e63c892b4478827333093080a23ae0e5ffd051fa81f7c2459dc99 WHIRLPOOL 84c8dd0307722d9f7fe66f463d0c1cbaa86fb7f677604392ef2e126bac369ce0719cd64446d643a2a804dcb901da9940d65036bd78d1a79ef9952bb4f8b43052
-DIST libadhocutil-0.3.6.1.tar.bz2 34237 SHA256 e20c3002f03696de56e3d0baabea7518d4d37d25466e2caeab7158e9df2f87ad SHA512 d5a34e9925abedd52ae0cd3b5eccf132ecaaa320cebdfbaa2b86302eb5bf16bbfe52efbdd4a3045cefe49b003fa543e8a7695e8ea2f1120125ad90ffceaa1c2e WHIRLPOOL a0a6dbb1d97b2c691cc8ba47033b5dd0987ac75604dca1b2683e7b94c08b158a673391073e4f001211a813ed288df0b0ccfd9dc416d853c6744ba862556c58f6
-DIST libadhocutil-0.3.7.tar.bz2 34414 SHA256 73b52c619160080e7382092990c4c3fbac4ebc82bc44a72607b513bf40fd1f2f SHA512 d5d82fce4ab88c90a1edc3bc7d6b2e4d93ebf4f884b10d1874f0cab12ff8073db06bdd88cfa785786a781176afe8706bc44eece701eda4122dc9a731a268565e WHIRLPOOL d7fa5928d5e495714626ce554ae13863d430259ed017f90d616420e99fcbfc16693e0dae83327ee02dac4bb1ca9d369bc1b4e7c83338679032b0f77ffc63099f
 DIST libadhocutil-0.3.8.tar.bz2 34831 SHA256 1f7d9a651c11141a95b33400df45e4edacefccbaa58c01090de0f639718d0c9d SHA512 59ee3588db31b55b9e0227928d243f38ce57ec7f9f4468a476948cc6631da373df63165a42d397e14dd7601a76b15bebf2a375bc5e908d53371b6482bc88eb64 WHIRLPOOL 372e98a40bb72948ebd7e801a6ef89cd9e46fd3133b5a2b18708b19db9a903753135474f8a85ec39e0a65a70db5814ccad6134716ed0d9972708814254feb1a7
-DIST libadhocutil-0.3.tar.bz2 27985 SHA256 5e8edc9075f941b3fa5cf5782cf7bc691b3a7fc818efe7b5516e0f7ee39ca151 SHA512 eefeea1b5a09b11af18b247163a51538da10fa3457938c348fd1cafa9d85d070f8d6664a9b5e77579fc8f2f6b091a4c1c55a318de11dbdaace8a18e401c1fbaa WHIRLPOOL 5b5551ef04a06000cd813651525b2fe5d27c7305c2c4450696305fad2ee402a03ad9dc8eeac6028634fb1f51f4a8f4d246ec64989e2784b6e997ad3150f25548
-DIST libadhocutil-0.4.1.tar.bz2 37730 SHA256 8db132ac46ccaa9df450017f0dbb91b7cfc0ea07e9284c769493247b2a734afd SHA512 c471d92e19799e9ed2dbabd3aff6e3bda5ef3e3f63a0db6517512271c0bac4096aecb80d8875ee8a52b29e5f8f433493315a88e6485f561ff0064720b48438e4 WHIRLPOOL 60f4de85de4088f88e7c6bcd4807c7d725c89be770507ba0c452aac55f13d089cce01ea7ad31d8bdfc3012bd966911e2fecc3fa9c7d210e147192999f9e7c87c
-DIST libadhocutil-0.4.2.tar.xz 37416 SHA256 b3f0846e447c35a517ccd26bf9d5246c3578d0e3625015d67f0dcfe448f2c563 SHA512 43a46f42b93832336c65045c74354c69454e8a5095a06ab02c8641a205a412c637b0ee7fb0e4d06aea363eb5f9c80a6fc279a1d79a4f2729dc7fed02cde86d0b WHIRLPOOL 17b4c36cc4f592fe113574fa5e2b7cc7c30cd048943ef3b96b0b558ba777123ec8ac1d3684a86164a13a06ec0c31324676d4e9fd983793eaecd9834034a08cc8
 DIST libadhocutil-0.4.3.1.tar.xz 38388 SHA256 8782f0ced0c6d97951bd5465f2bd1486aaf657b190fd21652c871acdf9738b1d SHA512 d6cdb4105d1dfe98688cf95ee058647a52aa32a9d60ad82e792ff716aabd7780bb504425b6774d80fa2bcad6576c69216648fa2c22fc43e3089517e3516e913f WHIRLPOOL 8bdee16121335e2e039463d0ebe93537bcb949a2dc7b80307229dce0187fb18d8946a90741960567b4781b9d51b9be45e92a47edf5ae429030d1c6802b421bc5
-EBUILD libadhocutil-0.1.ebuild 1328 SHA256 40fe7687827b39d95e0382763d2e2ebaaf4cacf4eca4da2ba1f9cd9f9bfdd1e0 SHA512 dbaf918370a32b13a89be1fb80381b39c7ddac34bb46a2c538fe8f0322db4d5f92fc4af30aad83f0683bd6969f0b49a571c2ab5c3139ff009b63f0e9485a7b31 WHIRLPOOL 490e4ca821ebde094cae1f95a62c15aac7d7ad8e89fe6d6514e8ab66fc804fef68f3a1ad7983a7298ae377a91db8b567814a8d7c270d172872c2fc2cb055d8a0
-EBUILD libadhocutil-0.2.1.ebuild 1324 SHA256 a4e6e588b482b13d3ed6b64dabde6f4d5c063927fc71ff1939b32f737743a24c SHA512 94144aa29e93ccc9826a2b47ba6fa508354a5ee323a7f2795a6b281dca8665dfbddc96b72897e91ca336dc251a9af1b447037ea9df4b14ae482e9fe578f719fc WHIRLPOOL 170448f5b7782c5f0509649346b30de11222950beb234c3e1962051e5898cc0895f297b2730d4e1dfbc3383d8e6a30712547826a6f8b00a0ea0e0dafdb1d26e6
-EBUILD libadhocutil-0.2.ebuild 1328 SHA256 40fe7687827b39d95e0382763d2e2ebaaf4cacf4eca4da2ba1f9cd9f9bfdd1e0 SHA512 dbaf918370a32b13a89be1fb80381b39c7ddac34bb46a2c538fe8f0322db4d5f92fc4af30aad83f0683bd6969f0b49a571c2ab5c3139ff009b63f0e9485a7b31 WHIRLPOOL 490e4ca821ebde094cae1f95a62c15aac7d7ad8e89fe6d6514e8ab66fc804fef68f3a1ad7983a7298ae377a91db8b567814a8d7c270d172872c2fc2cb055d8a0
-EBUILD libadhocutil-0.3.1.ebuild 1324 SHA256 a4e6e588b482b13d3ed6b64dabde6f4d5c063927fc71ff1939b32f737743a24c SHA512 94144aa29e93ccc9826a2b47ba6fa508354a5ee323a7f2795a6b281dca8665dfbddc96b72897e91ca336dc251a9af1b447037ea9df4b14ae482e9fe578f719fc WHIRLPOOL 170448f5b7782c5f0509649346b30de11222950beb234c3e1962051e5898cc0895f297b2730d4e1dfbc3383d8e6a30712547826a6f8b00a0ea0e0dafdb1d26e6
-EBUILD libadhocutil-0.3.2.ebuild 1328 SHA256 69800cd81898a318403e5d2a94ba2e2745fe7d988038d024d791dd93526fd74b SHA512 743fa77031d0a0fa2e26e977abfa4ce6202bd799c6f41967db73f8aa4da334d27de355d3ecfb3677fddc5830c2899a3d3035377d0e90e63e78332c9de537f175 WHIRLPOOL ae5d878d4b5e9290929898b3525f41b76d4ea0ce2c799e3001a5d3f04c6f9f8765e526b54443f7f79924fb963b3a1d1983a3749194ea49f0a5ff8b4a5bb27b47
-EBUILD libadhocutil-0.3.4.ebuild 1336 SHA256 72754b628d6d497a19f1db0fe0d318dc13ee69ec61caaf2ade89d5c4f0767f61 SHA512 618d5b18ca02da06f34fe6254d8162f903e36122e56b1c5f6e3092cec2b5c7d8b6cb93e514e18074420d332641e781f0a5d4790aa0c9a8f28df661952b9a479a WHIRLPOOL d1549cff70af994bfbb44b74e4b39b5779c04ea19c69092b062165c92814b9b63d7bef56ac790aee7c769f826efc65c1773ccedc8b555bbc4f80c44f8e9bb5b0
-EBUILD libadhocutil-0.3.5.ebuild 1336 SHA256 72754b628d6d497a19f1db0fe0d318dc13ee69ec61caaf2ade89d5c4f0767f61 SHA512 618d5b18ca02da06f34fe6254d8162f903e36122e56b1c5f6e3092cec2b5c7d8b6cb93e514e18074420d332641e781f0a5d4790aa0c9a8f28df661952b9a479a WHIRLPOOL d1549cff70af994bfbb44b74e4b39b5779c04ea19c69092b062165c92814b9b63d7bef56ac790aee7c769f826efc65c1773ccedc8b555bbc4f80c44f8e9bb5b0
-EBUILD libadhocutil-0.3.6.1.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85
-EBUILD libadhocutil-0.3.7.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85
-EBUILD libadhocutil-0.3.8.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85
-EBUILD libadhocutil-0.3.ebuild 1324 SHA256 a4e6e588b482b13d3ed6b64dabde6f4d5c063927fc71ff1939b32f737743a24c SHA512 94144aa29e93ccc9826a2b47ba6fa508354a5ee323a7f2795a6b281dca8665dfbddc96b72897e91ca336dc251a9af1b447037ea9df4b14ae482e9fe578f719fc WHIRLPOOL 170448f5b7782c5f0509649346b30de11222950beb234c3e1962051e5898cc0895f297b2730d4e1dfbc3383d8e6a30712547826a6f8b00a0ea0e0dafdb1d26e6
-EBUILD libadhocutil-0.4.1.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85
-EBUILD libadhocutil-0.4.2.ebuild 837 SHA256 124935a95fe03ef612b66308eef28cd79a397d48ec37c204de59a8e56428f18d SHA512 823139262e66fdc904fb577fa562d7938ec1fecc74a0b1d4ddbaa2f248ab58cd98bb1d8569924e496993a95f08eb24a68785dd083b6382f5974c84be0a60c734 WHIRLPOOL 5c0be64f8b5511258837fee2cdd5cc4cfa9d1190c3fb6bd3f28eba09d127d73419822951d6c69921bd6514bdb257de6506c989e851acebe90a8bd7902da5a7e3
-EBUILD libadhocutil-0.4.3.1.ebuild 837 SHA256 96a1761887409eb9f2df89523cbfd506acccacc52ddcb629e406f2cd90673ea5 SHA512 01bc81e24f0ef7996d6f537c88cdb30352da5079c68cf895aa11a5b8fd1617accc3e437afc02141910d7debb85dce1fe916c52b7e70f58b624e8b7ce01ed0f8c WHIRLPOOL 7fa5907783c312a45ab71c86412babfe305c332616fd680fe98f39986e50320ac0980843a10a3ac2db7aed09109fb79db2a513e5e2598f61eb225dd1862c56aa
+EBUILD libadhocutil-0.3.8.ebuild 1379 SHA256 6f6e9f0136317a9f3afe0bd5104508b0a5680aaf747d117a1b7529283b0d07c5 SHA512 e82cf690e6d032de1d118978c0ccbe2d547cdc0c882e84906d67d9edb56f978be49d796bd36757bd69b97063f139ec0bea36b5723d5cb7b121185ba47e6d3b10 WHIRLPOOL 112fa698b0592e8e22326402d74e72ef1320910730d925fbb5649060b1efe661fdc9aff9c55bc6a1804a9325b0fc9e5a89c36d19ab8a4c32f731b7ef0550f6d5
+EBUILD libadhocutil-0.4.3.1.ebuild 772 SHA256 8fd39c487744e9639b523e4c9f57eabfd7ed2c595e92a06033f0ad03d4b84939 SHA512 dc0083ada994e004d3f66d476809f0e5d7080d4cd2df818ee30bc2028c5b560f098e04944804d5bb5a547e3f90d1c8a5f75e5c8e0fcfd81571ded6d802b40d1a WHIRLPOOL e12b8c65cc473284d1a56b8f663f962e718a6ec4545f91a49b4825012c41ab31240f8a40f8ffbe29becb9ee03dbca4bd681a52f5e86ed14b85ac1fdf62e7ff34
diff --git a/dev-libs/libadhocutil/libadhocutil-0.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.1.ebuild
deleted file mode 100644
index d774373..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee /var/tmp/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.2.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.2.1.ebuild
deleted file mode 100644
index 6d4bc74..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.2.ebuild b/dev-libs/libadhocutil/libadhocutil-0.2.ebuild
deleted file mode 100644
index d774373..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee /var/tmp/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.1.ebuild
deleted file mode 100644
index 6d4bc74..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.2.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.2.ebuild
deleted file mode 100644
index 6724c9b..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.2"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild
deleted file mode 100644
index 29a8b80..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.5.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.5.ebuild
deleted file mode 100644
index 29a8b80..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.6.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.6.1.ebuild
deleted file mode 100644
index b6e7c3b..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.6.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-	dev-cpp/glibmm
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.7.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.7.ebuild
deleted file mode 100644
index b6e7c3b..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-	dev-cpp/glibmm
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.8.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.8.ebuild
index b6e7c3b..fa19345 100644
--- a/dev-libs/libadhocutil/libadhocutil-0.3.8.ebuild
+++ b/dev-libs/libadhocutil/libadhocutil-0.3.8.ebuild
@@ -1,4 +1,5 @@
 EAPI="5"
+inherit multilib
 
 DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
 HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
@@ -35,7 +36,7 @@ src_install() {
 	cd ${S}/libadhocutil || die
 
 	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
+		--libdir=${D}/usr/$(get_libdir) \
 		--includedir=${D}/usr/include/adhocutil || die
 
 	insinto /usr/include/adhocutil || die
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.ebuild
deleted file mode 100644
index 6d4bc74..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.4.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.4.1.ebuild
deleted file mode 100644
index b6e7c3b..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.4.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://libadhocutil.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-	dev-cpp/glibmm
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release adhocutil -q || die
-}
-
-src_install() {
-	cd ${S}/libadhocutil || die
-
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release install -q \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins ${S}/libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins *.ice || die
-
-	if use man ; then
-		mkdir -p ${D}/usr/share/man
-		(cat Doxyfile ;
-			echo OUTPUT_DIRECTORY=${D}/usr/share
-			echo PROJECT_NUMBER=${PV}
-		) | tee ${T}/doxy | doxygen - || die "Build docs failed"
-	fi
-}
-
-src_test() {
-	cd ${S}/libadhocutil || die
-	setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release -q || die
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild b/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild
deleted file mode 100644
index 625dcc4..0000000
--- a/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-EAPI="5"
-
-inherit bjam
-
-DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
-HOMEPAGE="http://docs.randomdan.homeip.net/libadhocutil"
-
-SRC_URI="http://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="GPL"
-SLOT="0/0.3.4"
-KEYWORDS="x86 amd64"
-IUSE="man test"
-
-RDEPEND="
-	net-misc/curl
-	dev-libs/Ice
-	dev-libs/boost
-	dev-cpp/glibmm
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	dev-util/boost-build
-	man? ( app-doc/doxygen )
-"
-
-src_compile() {
-	bjambuild libadhocutil//adhocutil || die
-}
-
-src_install() {
-	bjambuild libadhocutil//install \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
-
-	insinto /usr/include/adhocutil || die
-	doins libadhocutil/bin/*/*/*.h || die
-	insinto /usr/share/adhocutil/ice || die
-	doins libadhocutil/*.ice || die
-
-	if use man ; then
-		doxygenbuild
-	fi
-}
-
diff --git a/dev-libs/libadhocutil/libadhocutil-0.4.3.1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.4.3.1.ebuild
index e86ebdb..f43e9d4 100644
--- a/dev-libs/libadhocutil/libadhocutil-0.4.3.1.ebuild
+++ b/dev-libs/libadhocutil/libadhocutil-0.4.3.1.ebuild
@@ -25,13 +25,12 @@ DEPEND="
 "
 
 src_compile() {
-	bjambuild libadhocutil//adhocutil || die
+	bjambuild libadhocutil//adhocutil
 }
 
 src_install() {
-	bjambuild libadhocutil//install \
-		--libdir=${D}/usr/lib \
-		--includedir=${D}/usr/include/adhocutil || die
+	bjaminstall libadhocutil//install \
+		-i adhocutil
 
 	insinto /usr/include/adhocutil || die
 	doins libadhocutil/bin/*/*/*.h || die