Bump libadhoc for cache fix and related tweaks

4 files changed, 63 insertions, 3 deletions

diff --git a/dev-libs/icetray/Manifest b/dev-libs/icetray/Manifest
index 71b81b8..945694b 100644
--- a/dev-libs/icetray/Manifest
+++ b/dev-libs/icetray/Manifest
@@ -1,4 +1,4 @@
 DIST icetray-0.1_beta1.tar.bz2 4550 SHA256 a724d2f90f8c5db179c590e6cc7754306ab73797c6e862052a80dfaf9d4e1331 SHA512 6832f085d9903dfdea3f13a1abe15269213c0bb51094f3caab3c4cb9c672a90f7c3f7ed3e9b760c3aa9893014b50a2f95c58f04c8bbfe1d87dcb7bdb24ef1a75 WHIRLPOOL a799ccebb19a4a84bed2963801cf08678165d192bb1bda82c3f33cbc38e29e3847992c246a58b463163c68f934e8d9f00278b405a5e931e04684cd21c5b466b4
-DIST icetray-0.1_beta3.tar.bz2 5626 SHA256 4dec89ec4ddde8c0c3e45e78da459691d909a84b120cada61dbc03e6189945cd SHA512 38d0735a69d23f74b45f6d62b60639e20550af1fa0f743d0c4b7d7c49240027881205174978485af20393f1a7685bba3d26ad9d902a4062b0b721913c357ee32 WHIRLPOOL c13da29f53e63812b6ee16cc5498f77841c931509230e2171032a59e625c9cd38473f40956d34f429530defa1c7d10ccb0522076d21324d77e36ba5a6c28adbd
+DIST icetray-0.1_beta4.tar.bz2 5629 SHA256 e5abfb888f9fba1a684dd500031b01dd704d4a492cbc02d0b6ac3f3fa96d253b SHA512 84ed8eae227e8c34b789698795fbefcd8f2e448b3f01afd7e6a881e618a8b08d30b1be92c8b045fa2fa706973d4db49408b553784465c2e8dbf56232ee1989cf WHIRLPOOL ce3c88a91374271962c6c77b642e1e90677c2e0259c32d468060d441f9c13a405b899e9c9f7e94aca81b042b303092b15dcfcacb30afd8bad2f278f4e39a0938
 EBUILD icetray-0.1_beta1.ebuild 930 SHA256 5d2a50e95f58a5709e2c487b45f8c2562f2c815695a65e69c35a9d4e92989345 SHA512 e851c48c50232b3e430b2cac8b1b35ac0d518f1b6248cc440108f94a6ac127f94e9f801c9b32d26c1b2571d4139a0bec8c5b4a27987d4d185af8fe0ca627dde5 WHIRLPOOL ca52bbac6ee28d9c29288efb37679dd0fdb1eff88857e35af7c5418210ab4b0e2a7b9d508b4e25dd8693f0ca635086197769f05b5d37deac525bbe9b54fe83e2
-EBUILD icetray-0.1_beta3.ebuild 1037 SHA256 aea941b3f5cd0d5349cb18b65d753982b83662f1c9c201cb4c8295a10ef2185a SHA512 53bb87567a23b65371977c914345bbdb5670c7e21b660dfac3d08d5f2115b923190feadfa765d5066af2892ccb6415115571baf5ec3c95132d71f0147d446ca8 WHIRLPOOL 33bfde9e47e0b46cadb5f6bb93add804b99cd035426858d3eb6d445758d86db62d3a9ff3ef0f54f5e583bc583f0171797732183c10eb2ee5927376a79120590a
+EBUILD icetray-0.1_beta4.ebuild 1037 SHA256 bbb24a17a8eefcbd548a1e6e02598266f672e5013a4c169981ae99009ec97b28 SHA512 f1edc901ebea3384b4cd50ac6137b81a1ee2ba295b3fcf198fda154d4cacd24227eb3fd73a2c6dbe03010f0457b3dd03c28944e4508b685adcf45c378c083ec7 WHIRLPOOL 1a87260d129d3e7bc324692a0e3b79e453aa582097f6ba164a869113750197ad94236c6db84a0786eaa4b507247dcc804f82a64d9bbc756d43457db9d8ab2d5a
diff --git a/dev-libs/icetray/icetray-0.1_beta3.ebuild b/dev-libs/icetray/icetray-0.1_beta4.ebuild
index aff03a3..46de5ea 100644
--- a/dev-libs/icetray/icetray-0.1_beta3.ebuild
+++ b/dev-libs/icetray/icetray-0.1_beta4.ebuild
@@ -13,7 +13,7 @@ RDEPEND="
 	dev-libs/boost
 	dev-libs/Ice
 	dev-libs/libdbpp:=
-	>=dev-libs/libadhocutil-0.3.2:=
+	>=dev-libs/libadhocutil-0.3.3:=
 	dev-cpp/slicer:=[db]
 	tools? ( dev-util/boost-build )
 "
diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest
index 28e7f7f..849698f 100644
--- a/dev-libs/libadhocutil/Manifest
+++ b/dev-libs/libadhocutil/Manifest
@@ -3,10 +3,12 @@ DIST libadhocutil-0.2.1.tar.bz2 24008 SHA256 c7d2977111c0cffa214bff12fce905ca4f7
 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.tar.bz2 27985 SHA256 5e8edc9075f941b3fa5cf5782cf7bc691b3a7fc818efe7b5516e0f7ee39ca151 SHA512 eefeea1b5a09b11af18b247163a51538da10fa3457938c348fd1cafa9d85d070f8d6664a9b5e77579fc8f2f6b091a4c1c55a318de11dbdaace8a18e401c1fbaa WHIRLPOOL 5b5551ef04a06000cd813651525b2fe5d27c7305c2c4450696305fad2ee402a03ad9dc8eeac6028634fb1f51f4a8f4d246ec64989e2784b6e997ad3150f25548
 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.ebuild 1324 SHA256 a4e6e588b482b13d3ed6b64dabde6f4d5c063927fc71ff1939b32f737743a24c SHA512 94144aa29e93ccc9826a2b47ba6fa508354a5ee323a7f2795a6b281dca8665dfbddc96b72897e91ca336dc251a9af1b447037ea9df4b14ae482e9fe578f719fc WHIRLPOOL 170448f5b7782c5f0509649346b30de11222950beb234c3e1962051e5898cc0895f297b2730d4e1dfbc3383d8e6a30712547826a6f8b00a0ea0e0dafdb1d26e6
diff --git a/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild b/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild
new file mode 100644
index 0000000..29a8b80
--- /dev/null
+++ b/dev-libs/libadhocutil/libadhocutil-0.3.4.ebuild
@@ -0,0 +1,58 @@
+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
+}
+