diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2015-02-19 07:41:13 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2015-02-19 07:41:13 +0000 |
commit | ae475a28c4745298ceede222852e4ac26b1a89ff (patch) | |
tree | 8573d205f534689adb42242d0bfc6bc3c7ca3e0d | |
parent | Remove old. (diff) | |
download | historical-ae475a28c4745298ceede222852e4ac26b1a89ff.tar.gz historical-ae475a28c4745298ceede222852e4ac26b1a89ff.tar.bz2 historical-ae475a28c4745298ceede222852e4ac26b1a89ff.zip |
Security cleanup, wrt bug #490990
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42
23 files changed, 30 insertions, 1112 deletions
diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog index 4d5c03699cf9..b8da6118ab36 100644 --- a/app-misc/hivex/ChangeLog +++ b/app-misc/hivex/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for app-misc/hivex # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.30 2015/02/19 07:34:27 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.31 2015/02/19 07:41:12 pinkbyte Exp $ + + 19 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> -hivex-1.3.2-r2.ebuild, + -hivex-1.3.7-r1.ebuild, -files/autoconf_fix-1.3.2.patch, + -files/python-test-fix-1.3.2.patch, -files/ruby_runpath_fix-1.3.2.patch, + -files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch, + -files/1.3.3/0002-automake.patch, + -files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch, + -files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch, + -files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch, + -files/1.3.5/0002-add_per_triplet_in_configure.ac.patch, + -files/1.3.5/0003-fix_python_defenition_configure.ac.patch, + -files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch, + -files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch, + -files/1.3.6/0002-add_per_triplet_in_configure.ac.patch, + -files/1.3.6/0003-fix_python_defenition_configure.ac.patch, + -files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch, + -files/1.3.6-r1/disable_automagic_cumulative_patch.patch, + -files/1.3.6-r1/fix_python_linking.patch, + -files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch, + -files/1.3.7/ruby1.9_fix_deprection.patch: + Security cleanup, wrt bug #490990 19 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> hivex-1.3.11.ebuild: QA: drop base eclass, drop redundant inherit on autotools eclass diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest index 1e6b36d3ca00..8ce91f0a9832 100644 --- a/app-misc/hivex/Manifest +++ b/app-misc/hivex/Manifest @@ -1,41 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch 1948 SHA256 e2f72baf94dee3439179250108e2ae05cf7e7b3d1c94f7e2481ae0d9bd6c2328 SHA512 907a4258c150acaf51ca282df66262b43dff8214bab758e8dc19e532ef1a688655ba3e1138916f7cac792245ef16c8c3bdf776d28da9188a5ed6b68434c180a0 WHIRLPOOL dccab341db4c14b6fb05799e93e33105a1624051609fec024beaf596e9071a19fb6671e191e50ce016a7b526224309319543424716d62ae54cdc5e4cf82fc5b2 -AUX 1.3.3/0002-automake.patch 2095 SHA256 89d52f2c0a5ade1e00b6bea33e38004bf3a24fc721ff90c5d930aa24b2f81c82 SHA512 e0c7a08be9fb398f5573969ef04d5c3332f581c0dc65513ede9b7ef65d903fbc4d498d05b372edb844f4292dd50d267504e9363a8649f137cd12c61aa24f293c WHIRLPOOL 6f947b6810f3975c58aed114a7419bda1e9e460d9f2c89e17c8d49225a461be09cbe1b0f18bdbfa737aa880f27d19d15bb65ae266bac8e716433a135dc73da0f -AUX 1.3.3/0003_autoconf_fix_automagic-1.3.3.patch 3274 SHA256 1562f50ee11b75756ae3c6854b7746085b46904a29581c04ea73a318b10129e4 SHA512 5b298e9aef8c3b7595fb36a8d7eb16dde7f464ffb9669ad448efa8fbbccffd852eda5e9b7286f9259f6d3bdcbf5849e09eff0306dd544825defa5fb372d1e951 WHIRLPOOL aff0305a4d24b2445aedbc8c76fe604cb61bef3e9d28ed9dbabaee3b777967cd92fe11e76f58dcaf32199af8413adb31d5126e6c0736df2b4688fccf8a04797a -AUX 1.3.3/0004-ruby_runpath_fix-1.3.3.patch 860 SHA256 97eaf90cb14f3f0997a824dc4d45a48c51e67df98f3c456403fb147c4bd35565 SHA512 d0794ec6199a46908f7aa39b90d464a553ffc7b323bd5abb574bf905632959b90a758f0168972d0134abe6778feca4cd211b9aaa8bad6678f23f54d16d633846 WHIRLPOOL 4c8f91c381759beace4c41a2b3714bed10aeb60aad92591783da019128be1dc7b30bc0ca2fee66ed3d9fa9cb241d9b1070426d0089221f0859ad605aabeb419b -AUX 1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch 641 SHA256 16a8043e21b7394e8e6eb18e1229b1c598a3dd9559bd8b8e98714baa74dea1d4 SHA512 4f90fcc3be4f470e32b441dcdaf2397551c73c1ef5082a57e6b162854d3a8eac575e4a6d175480312aa238e73c165e5eceae1f190f448a3f2d1b78e281cebcf6 WHIRLPOOL 15a01336bd7b7de556244aded1edbf85034009f28c7df76cd374cca7b0644461ecdc440d824381b835feb2c8681339593f18141300dea1192c21d140b0a9ed97 -AUX 1.3.5/0002-add_per_triplet_in_configure.ac.patch 1134 SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921 SHA512 af9477d48fbb054a4252b3529de768a503699cddaf0d1ce62df2d63ca838683bde565a5d5c8b73c3556b6a5fa314a5ff34b0a74a7d180ebfeab2e513e8a82072 WHIRLPOOL 46d62c6970beb7f1f4082e0be98fb53e5d44c311aaed5a1c505758e4c13e835003e18e1271a28b8398a439fde85c4073a7ad4dd104dff73b9f29a3cd279e95b3 -AUX 1.3.5/0003-fix_python_defenition_configure.ac.patch 579 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1 SHA512 70cf62ce5d744d4ac6086d0ca97e324e166c74b9fe1b87c3b35b55746424df3f49c721899a879a7339d7eb3a3f6fe8671968165b53fce446fc9cfe73a61c70c0 WHIRLPOOL 0ea6425f86f6e3842b44de63b7bef188d7a0646dda4c566a34405ea08e3d75028908e0ced09fadf7a4806624c35551554f4b5cac07bf486b8b2034cd02227293 -AUX 1.3.5/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e -AUX 1.3.6-r1/disable_automagic_cumulative_patch.patch 10680 SHA256 0564a8e735e4c01c9982e2ec44af8a2854b486a61c193bc7662a8779872e6596 SHA512 b08f54a6ea1f17fb69705934d3a2a5a3b817c370ad3ea135e39c0ed0ef0e485cce323462f79c3ff7855fc5e57568d23f04d71e6c1dd8d058fdb333facaf786ae WHIRLPOOL f57d42fb836bed9c3fed981bff55f2821bd3a3de7fac9baf3e79e50b60bd79e0bc9905fe159916494af5f06ae1d793584627062218eac11f5f3383c91ebadb38 -AUX 1.3.6-r1/fix_python_linking.patch 496 SHA256 8bed6ba6f701b680659473c23fc9cc0567b57442badfbc9d3944e0b23f2e1b1a SHA512 d83b1ecedcdcbb2fe948cd2186cf017053ab715ae7eab28ffce15eef274203259246a0aab3621ea494910aced79aa296e42fced16151c4d7b755f45a61c1297e WHIRLPOOL 1b0a180df74c35ee1788d094ce2ddf2ad6bdd2e7345e506d25f75e5864e94a45cef3e9fb8163446f1a6c065d9380df34a4bec84e376773c6432f2683331f42de -AUX 1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch 641 SHA256 16a8043e21b7394e8e6eb18e1229b1c598a3dd9559bd8b8e98714baa74dea1d4 SHA512 4f90fcc3be4f470e32b441dcdaf2397551c73c1ef5082a57e6b162854d3a8eac575e4a6d175480312aa238e73c165e5eceae1f190f448a3f2d1b78e281cebcf6 WHIRLPOOL 15a01336bd7b7de556244aded1edbf85034009f28c7df76cd374cca7b0644461ecdc440d824381b835feb2c8681339593f18141300dea1192c21d140b0a9ed97 -AUX 1.3.6/0002-add_per_triplet_in_configure.ac.patch 1134 SHA256 6ac6aef58d8c6227685ef358e17fcfb15271f3fa6fb070acb0226297e546b921 SHA512 af9477d48fbb054a4252b3529de768a503699cddaf0d1ce62df2d63ca838683bde565a5d5c8b73c3556b6a5fa314a5ff34b0a74a7d180ebfeab2e513e8a82072 WHIRLPOOL 46d62c6970beb7f1f4082e0be98fb53e5d44c311aaed5a1c505758e4c13e835003e18e1271a28b8398a439fde85c4073a7ad4dd104dff73b9f29a3cd279e95b3 -AUX 1.3.6/0003-fix_python_defenition_configure.ac.patch 579 SHA256 36249620e3ec13f7e68b2c7cf3df7bc2bee2d91d482d38eb82f8e68bbacf41c1 SHA512 70cf62ce5d744d4ac6086d0ca97e324e166c74b9fe1b87c3b35b55746424df3f49c721899a879a7339d7eb3a3f6fe8671968165b53fce446fc9cfe73a61c70c0 WHIRLPOOL 0ea6425f86f6e3842b44de63b7bef188d7a0646dda4c566a34405ea08e3d75028908e0ced09fadf7a4806624c35551554f4b5cac07bf486b8b2034cd02227293 -AUX 1.3.6/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e -AUX 1.3.7/0004-ruby_runpath_fix-1.3.5.patch 846 SHA256 702c552265029298fbf45b6ab15c007b18051021cc73a54f612e457c4ab2d776 SHA512 ea009c3cf9da4d347016d3568a743a3734678c1ef842a4d0eaac6b9561092853a9044da5ec13d849917f68166a58de2da5fc9320c2d67b382769f2ca3a0de8c9 WHIRLPOOL f92d7fc9b91863f3e6b9f047b175f498d43759285a2fbe96a8954aa69ce5be54537ca5884c0ffc27a7bfcb51b495bfb4f8d68e0184c0e44e3e9840cceac84e8e -AUX 1.3.7/ruby1.9_fix_deprection.patch 1176 SHA256 59a9bc1809f771474739e3b91b665364a2febfdd43c0840e86201a4025f85454 SHA512 3abd265764e4edb9a6368bb2cc696671cc24d8df234833c11515fc1192da7c1e614f17a34f44102c6925eb2ee7c42d88a98c3d72c07749bc690748af19b2b5dd WHIRLPOOL 07ce40388cd58d1d3abbe5b9b6d12401892d7856475b2a15fdf3dc529783cb96de26135933dc1b94b084f5a0e791961de40ba65c776559fb37f3540fe1a57053 -AUX autoconf_fix-1.3.2.patch 3561 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26 SHA512 7e829d2b60eba4ec74785dfae1bb2086cf5a82b9b7d2fe2c7b4f2ed06c8623cdde51cdc789d13a1dbf81bd2e9732f97975999522dd2935b8e06ab875ca854a7d WHIRLPOOL 409cb583e48b6e1281c8ec3147cf7a7ba79c59a112c2ce0b50be886cc9c3b2ff073a404357471f75963a0811d51cad6fcf033afc85eb49a99c6803e540b1f551 -AUX python-test-fix-1.3.2.patch 281 SHA256 9bed6a09223f6429966b9c49ffa1fa597127190fec79aee99dd514734d3cc53b SHA512 e2e9ce40687ff275c33d5a00f1c1f023ce7f9dfc5069796737e125106c15e2f81c46fb9a4235ef9aa65eefd0567b06caa1cd872049e7fc1bceb3b78207d72da4 WHIRLPOOL a6e4ee6c9f74c563df5dfd6ae7d083a541825ae482919bf6f7308b8f6815ce70999f87b41700ad0f43a923ae88a3f4097350cc40029b351caaaad82fdec9ae88 -AUX ruby_runpath_fix-1.3.2.patch 860 SHA256 97eaf90cb14f3f0997a824dc4d45a48c51e67df98f3c456403fb147c4bd35565 SHA512 d0794ec6199a46908f7aa39b90d464a553ffc7b323bd5abb574bf905632959b90a758f0168972d0134abe6778feca4cd211b9aaa8bad6678f23f54d16d633846 WHIRLPOOL 4c8f91c381759beace4c41a2b3714bed10aeb60aad92591783da019128be1dc7b30bc0ca2fee66ed3d9fa9cb241d9b1070426d0089221f0859ad605aabeb419b DIST hivex-1.3.11.tar.gz 1264487 SHA256 c63adf6c7ef9140acf20775d35bef35ab563c0d2f59d3dfb8e0d15cfa7c77678 SHA512 1ff9fbcfb976fea5bba41c5ff06e4dc68af0e507accc236ca0406644ee2c865619b3b3bf9550124778fcd782ddc257f1d89861b45f48c0c3ceed18dfa1e02ced WHIRLPOOL 6d741ad14660390b2c171bff400645cbcd20a991a55b7fb4e349c864e2dd4e606f57f344d8b851acf87d12bf8a3b608a77c073c565d9aa55cd23094d7e09e8cd -DIST hivex-1.3.2.tar.gz 1082330 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c SHA512 2ffa3585bd76f4c7daeb780e9bde8b22ec85caa5e8bbd8e1d7192c828e7914331e669f20b1aa6477cf72072699395b1c91877322f83e74067069f09e6a7c7ddc WHIRLPOOL 9373a88ed0a6fb0fb7d9011c8c2800ca9c4c9ff3f5121653d6150cfbb17243f6d94bee80a28a92b34be29f59df7e4f971d9acc3c03dd0049eb4524069a52471a -DIST hivex-1.3.7.tar.gz 1168881 SHA256 9f74432bb7b620d6629265fa5efefa45a978b1ee80e4891d12789dc34896eb83 SHA512 0e3cbd02e457472a53ec06e0aab3d6fc65f67cf97d1f0bd5d62cadb52fd8f70f4281ee7e1fc614a5aa030d86edaab32c2eea3b9d9d9e2d77c12e4c421118a142 WHIRLPOOL 759307f458c1f2f082462aedc7f19cb5175f72a89efc32815d22f02b26353a73e5c5d0967ff2d002de919a17ae9999fec51b648355a8cdfefbc0557bc33bf9a6 EBUILD hivex-1.3.11.ebuild 2210 SHA256 fe0969217d9af0385794bd2b8ab94a7ac9a4975d00f8fb69ce7dd257f0ca4a63 SHA512 8b5a75ea67758ea4f20ac2c695de19d22ae591dba38f4275c4bcccafacdb775481d5cffd7cb775a6875d6ba4c0fc0ae94b87fdd61909c6eb3eee00decfe6cc3b WHIRLPOOL f2c179dcd879ad6c7c5a4ce08d99fd6fbad7909204e6bea68bcddbcd4ecf49f303d1bba128c27a60bd6b6bafce76e4e4eb0e32434ca4f7b8a75bfb051a736bc2 -EBUILD hivex-1.3.2-r2.ebuild 1801 SHA256 ce1a2ea8706f906906c2b1454fb4136fdcd88674a09df0207d5ef2dd625b66aa SHA512 00d7090183d1ac32063552fd1d3304c5fbd895ea49047b34947cee32403d3c235c3f529b4a4253621c68673dc8bf2e4b844eb73030804c9fa5fa4b2a30b4819b WHIRLPOOL 776f2ae100e3914b1c5ccd423d639d14419fc27f4c3e071fb26803bd681fdeb0a1213518e859c916ebf0e486d8109ce920bdca3e0d9199ccedb07aa08afafa87 -EBUILD hivex-1.3.7-r1.ebuild 2354 SHA256 f9b681b6540d66ab01049621fbb9a3e3a42a77df386f5806dbe5a5c2050a20d1 SHA512 92d3697f63cfa0062c430feb70d06b8c21b2baecf636e1efba86ecda7c1c908ff8bba513ff3df7461af3a845e4edfca12f50889d4486fee3f6b95bf371d91856 WHIRLPOOL 9ba0acb42e63ef25913cb2fe1c6de798d477d5266a01b770c2a6d2898bcdc5efd56265cdc32e48b736e7f5499354e5026549ad2b80c1ce63747dbdf32e22675e -MISC ChangeLog 6299 SHA256 100f9422f79d45669ddd2daa918e1424b17337fa84860e5522824bdc7ad38a5b SHA512 097d2a1ce1f7c198ead770b1500fe89c3cd1b3079912b5c6edfa353102ed53c9362bc9acb88f80f4fd652b32175adc04f3c58517a28d676bdf18ee40ec6be39b WHIRLPOOL 804816ab0c756734a76e4298f172100d43d403bc8c870ce562db92744e2f03be3f9dc8e7ace2b759f33329ce3cdaee9439006b76dd54b27c46674cbebee1ab33 +MISC ChangeLog 7413 SHA256 699186a60774fee4232ce2eb5449af075cc3154f0c3ceb32cce6e11ab4a602e1 SHA512 50d3a78eca88176ae91cd9aa2f0e9bf0d1c87f9a04c0bc0984a2146919a2f0bcd26a56e6065ffed02e22875ff425fca98956e330a785e7212d7da41f9170ef99 WHIRLPOOL 413f0d7f99489664707f49d01853ecbf5ad490bc55c691002810350f11910b8e1c225b022426676289fa20c22167f25dc465ed3e607c4aab9280e5dc3213ff40 MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJU5ZIDAAoJECo/aRed9267PRcH/j34w4jIADo6Rt8BYRzx7Uv5 -PzrTvkbY5Dgvx4roX05KuEV4McoFg5leXL2V5z7Bsid54+jizSdOBceziQ7UBUIL -bJq/xZxhDfRLsYXsspJvGUl59qOwHgQg9Ggajt2qukET4Ubb3yiE/xuqg9zDPzoX -ksit1ycdXZVvO00Ghq1gI4F4LXcs58wpIgjxX9o3hjUWYc9XvOwBXdA42TJErFxf -CRkOBXq4GwEzhxaES1zVRg7PEWdSftyJ6S0nwvA22mfeWC2S01ILBQT3yrzyP7xS -j5TyU4Rx3jL6Aed8YcLQYPJVDJdazzo3N7wsi1dcJd8Y8ovMEyDycJFyeDw6AVM= -=nxl+ +iQEcBAEBCAAGBQJU5ZOYAAoJECo/aRed9267V3kIAKB7pMicKgG1IlAFAWcW/v11 +PGxmkwzkPYBhEB4O+40JAsBvSYidXSPoyBgS7UklORcGS6+mZly7Sa9TYj9qsscf +wcbS4TEtH8fdK5V3ig+8hjoKm1Q81DyHktSOTjk5jGfpRoC/CiSN/nyLcA8FOkQT +dsGf2HEe1gX9roKen89NWsvvvAojOpFTqpcMgZvOPyv0D9nebv7JhYz8DcI7IavJ +kKrUx+ckipu/SonemLwKYkUXHCVmbI4pHHY8V+dE673pN6Y16vDloEmgdMcZJWob +OiCmFE3nR+5Q5Nwm6eNK/9yaxjmMa4SepRCRtgyvaZcJOpum9joRSAZGaXKBXUw= +=Z+XR -----END PGP SIGNATURE----- diff --git a/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch b/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch deleted file mode 100644 index 553f7a7ad87e..000000000000 --- a/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Hilko Bengen <bengen@debian.org> -Date: Thu, 1 Dec 2011 22:07:26 +0100 -Subject: Fixed gnulib integration for hivexml - ---- - lib/Makefile.am | 5 ++++- - sh/Makefile.am | 1 + - xml/Makefile.am | 3 ++- - xml/hivexml.c | 2 ++ - 4 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index cfd2e05..a339a00 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -39,7 +39,10 @@ libhivex_la_LDFLAGS = \ - $(LTLIBINTL) \ - $(LTLIBTHREAD) - libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) --libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir) -+libhivex_la_CPPFLAGS = \ -+ -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ -+ -I$(srcdir) - - include_HEADERS = hivex.h - -diff --git a/sh/Makefile.am b/sh/Makefile.am -index 0898370..a6f5ae6 100644 ---- a/sh/Makefile.am -+++ b/sh/Makefile.am -@@ -38,6 +38,7 @@ hivexsh_SOURCES = \ - hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE) - hivexsh_CFLAGS = \ - -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/lib \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) -diff --git a/xml/Makefile.am b/xml/Makefile.am -index b2af45d..67ba248 100644 ---- a/xml/Makefile.am -+++ b/xml/Makefile.am -@@ -23,10 +23,11 @@ bin_PROGRAMS = hivexml - hivexml_SOURCES = \ - hivexml.c - --hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) -+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS) - hivexml_CFLAGS = \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/lib \ - $(LIBXML2_CFLAGS) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) -diff --git a/xml/hivexml.c b/xml/hivexml.c -index 5030c24..d38e9d4 100644 ---- a/xml/hivexml.c -+++ b/xml/hivexml.c -@@ -32,6 +32,8 @@ - #include <libintl.h> - #endif - -+#include <getopt.h> -+ - #include <libxml/xmlwriter.h> - - #include "hivex.h" --- diff --git a/app-misc/hivex/files/1.3.3/0002-automake.patch b/app-misc/hivex/files/1.3.3/0002-automake.patch deleted file mode 100644 index 8af8117c7f64..000000000000 --- a/app-misc/hivex/files/1.3.3/0002-automake.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Hilko Bengen <bengen@debian.org> -Date: Thu, 1 Dec 2011 22:08:07 +0100 -Subject: automake - ---- - lib/Makefile.in | 6 +++++- - sh/Makefile.in | 1 + - xml/Makefile.in | 6 ++++-- - 3 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/lib/Makefile.in b/lib/Makefile.in -index 65734dd..5cf7bde 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -1045,7 +1045,11 @@ libhivex_la_LDFLAGS = \ - $(LTLIBTHREAD) - - libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) --libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir) -+libhivex_la_CPPFLAGS = \ -+ -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ -+ -I$(srcdir) -+ - include_HEADERS = hivex.h - man_MANS = hivex.3 - noinst_DATA = \ -diff --git a/sh/Makefile.in b/sh/Makefile.in -index 109c8e8..0308a32 100644 ---- a/sh/Makefile.in -+++ b/sh/Makefile.in -@@ -995,6 +995,7 @@ hivexsh_SOURCES = \ - hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE) - hivexsh_CFLAGS = \ - -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/lib \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) -diff --git a/xml/Makefile.in b/xml/Makefile.in -index ed4cd72..5cb647f 100644 ---- a/xml/Makefile.in -+++ b/xml/Makefile.in -@@ -119,7 +119,8 @@ PROGRAMS = $(bin_PROGRAMS) - am_hivexml_OBJECTS = hivexml-hivexml.$(OBJEXT) - hivexml_OBJECTS = $(am_hivexml_OBJECTS) - am__DEPENDENCIES_1 = --hivexml_DEPENDENCIES = ../lib/libhivex.la $(am__DEPENDENCIES_1) -+hivexml_DEPENDENCIES = ../lib/libhivex.la ../gnulib/lib/libgnu.la \ -+ $(am__DEPENDENCIES_1) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent -@@ -976,10 +977,11 @@ EXTRA_DIST = \ - hivexml_SOURCES = \ - hivexml.c - --hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) -+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS) - hivexml_CFLAGS = \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir)/gnulib/lib \ -+ -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/lib \ - $(LIBXML2_CFLAGS) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) --- diff --git a/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch b/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch deleted file mode 100644 index e49d2d390e0c..000000000000 --- a/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -183,11 +183,19 @@ - AC_CHECK_FUNC([open_memstream]) - AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"]) - -+ - dnl Check for OCaml (optional, for OCaml bindings). -+AC_ARG_ENABLE([ocaml], -+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) -+ -+ -+ -+ - AC_PROG_OCAML - AC_PROG_FINDLIB - AM_CONDITIONAL([HAVE_OCAML], -- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]) -+ - AM_CONDITIONAL([HAVE_OCAMLOPT], - [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) - -@@ -227,21 +235,32 @@ - dnl Check for Perl modules that must be present to compile and - dnl test the Perl bindings. - missing_perl_modules=no --for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -- AC_MSG_CHECKING([for $pm]) -- if ! perl -M$pm -e1 >/dev/null 2>&1; then -- AC_MSG_RESULT([no]) -- missing_perl_modules=yes -- else -- AC_MSG_RESULT([yes]) -- fi --done --if test "x$missing_perl_modules" = "xyes"; then -- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) --fi -+AC_ARG_ENABLE([perl], -+ AS_HELP_STRING([--with-perl],[build Perl binding])) -+ -+ -+PERL= -+AS_IF([test "x$enable_perl" != "xno" ],[ -+ AC_CHECK_PROG([PERL],[perl],[yes],[no]) -+ -+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -+ AC_MSG_CHECKING([for $pm]) -+ if ! perl -M$pm -e1 >/dev/null 2>&1; then -+ AC_MSG_RESULT([no]) -+ missing_perl_modules=yes -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ done -+ -+ AS_IF([test "x$missing_perl_modules" = "xyes"], -+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], -+ ) -+]) - - AM_CONDITIONAL([HAVE_PERL], -- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) -+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) -+ - - dnl Check for Python (optional, for Python bindings). - PYTHON_PREFIX= -@@ -251,6 +270,7 @@ - - AC_CHECK_PROG([PYTHON],[python],[python],[no]) - -+ - if test "x$PYTHON" != "xno"; then - AC_MSG_CHECKING([Python prefix]) - PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` -@@ -308,15 +328,24 @@ - AC_SUBST(PYTHON_INCLUDEDIR) - AC_SUBST(PYTHON_INSTALLDIR) - -+AC_ARG_ENABLE([python], -+ AS_HELP_STRING([--with-python],[build Python binding])) -+ - AM_CONDITIONAL([HAVE_PYTHON], -- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) -+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) -+ -+ - - dnl Check for Ruby and rake (optional, for Ruby bindings). -+AC_ARG_ENABLE([ruby], -+ AS_HELP_STRING([--with-ruby],[build Ruby binding])) -+ - AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) - AC_CHECK_PROG([RAKE],[rake],[rake],[no]) - - AM_CONDITIONAL([HAVE_RUBY], -- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) -+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"]) -+ - - dnl dnl Check for Java. - dnl AC_ARG_WITH(java_home, diff --git a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch b/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch deleted file mode 100644 index 5b77ede9d5c2..000000000000 --- a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby/Rakefile.in.orig 2012-04-16 20:16:14.989449899 +0200 -+++ ruby/Rakefile.in 2012-04-16 20:17:08.006443779 +0200 -@@ -38,7 +38,7 @@ - # Build locally - - file MAKEFILE => EXT_CONF do |t| -- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" -+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" - $stderr.puts "Failed to run extconf" - break - end diff --git a/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch deleted file mode 100644 index d82db8a1aff3..000000000000 --- a/app-misc/hivex/files/1.3.5/0001-add_ocaml_triplet_in_configure.ac.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -187,10 +187,12 @@ - AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"]) - - dnl Check for OCaml (optional, for OCaml bindings). -+AC_ARG_ENABLE([ocaml], -+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) - AC_PROG_OCAML - AC_PROG_FINDLIB - AM_CONDITIONAL([HAVE_OCAML], -- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]]) - AM_CONDITIONAL([HAVE_OCAMLOPT], - [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) - diff --git a/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch deleted file mode 100644 index f3339d2bd9f4..000000000000 --- a/app-misc/hivex/files/1.3.5/0002-add_per_triplet_in_configure.ac.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -245,8 +245,31 @@ - AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) - fi - -+AC_ARG_ENABLE([perl], -+ AS_HELP_STRING([--with-perl],[build Perl binding])) -+ -+ -+PERL= -+AS_IF([test "x$enable_perl" != "xno" ],[ -+ AC_CHECK_PROG([PERL],[perl],[yes],[no]) -+ -+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -+ AC_MSG_CHECKING([for $pm]) -+ if ! perl -M$pm -e1 >/dev/null 2>&1; then -+ AC_MSG_RESULT([no]) -+ missing_perl_modules=yes -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ done -+ -+ AS_IF([test "x$missing_perl_modules" = "xyes"], -+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], -+ ) -+]) -+ - AM_CONDITIONAL([HAVE_PERL], -- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) -+ [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) - - dnl Check for Python (optional, for Python bindings). - PYTHON_PREFIX= diff --git a/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch deleted file mode 100644 index d74b17c1e7c5..000000000000 --- a/app-misc/hivex/files/1.3.5/0003-fix_python_defenition_configure.ac.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -336,8 +336,11 @@ - AC_SUBST(PYTHON_INCLUDEDIR) - AC_SUBST(PYTHON_INSTALLDIR) - -+AC_ARG_ENABLE([python], -+ AS_HELP_STRING([--with-python],[build Python binding])) -+ - AM_CONDITIONAL([HAVE_PYTHON], -- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) -+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) - - dnl Check for Ruby and rake (optional, for Ruby bindings). - AC_ARG_ENABLE([ruby], diff --git a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch deleted file mode 100644 index 25624c7104d1..000000000000 --- a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400 -+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400 -@@ -38,7 +38,7 @@ - # Build locally - - file MAKEFILE => EXT_CONF do |t| -- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" -+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" - $stderr.puts "Failed to run extconf" - break - end diff --git a/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch b/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch deleted file mode 100644 index 72ae84757b19..000000000000 --- a/app-misc/hivex/files/1.3.6-r1/disable_automagic_cumulative_patch.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -187,14 +187,26 @@ AC_CHECK_FUNC([open_memstream]) - AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"]) - - dnl Check for OCaml (optional, for OCaml bindings). --AC_PROG_OCAML --AC_PROG_FINDLIB -+OCAMLC=no -+OCAMLFIND=no -+AC_ARG_ENABLE([ocaml], -+ AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]), -+ [], -+ [enable_ocaml=yes]) -+AS_IF([test "x$enable_ocaml" != "xno"], -+ [dnl OCAMLC and OCAMLFIND have to be unset first, otherwise -+ dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look. -+ OCAMLC= -+ OCAMLFIND= -+ AC_PROG_OCAML -+ AC_PROG_FINDLIB -+ ]) - AM_CONDITIONAL([HAVE_OCAML], -- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) - AM_CONDITIONAL([HAVE_OCAMLOPT], -- [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) - --if test "x$OCAMLC" != "xno"; then -+if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then - dnl Check if we have caml/unixsupport.h header (OCaml bindings only). - old_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$OCAMLLIB" -@@ -223,28 +235,32 @@ if test "x$OCAMLC" != "xno"; then - rm -f conftest conftest.* conftest_ml.* - fi - --dnl Check for Perl (optional, for Perl bindings). --dnl XXX This isn't quite right, we should check for Perl devel library. -+dnl Check for Perl (optional, for Perl bindings and Perl tools). - AC_CHECK_PROG([PERL],[perl],[perl],[no]) - --dnl Check for Perl modules that must be present to compile and --dnl test the Perl bindings. --missing_perl_modules=no --for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -- AC_MSG_CHECKING([for $pm]) -- if ! perl -M$pm -e1 >/dev/null 2>&1; then -- AC_MSG_RESULT([no]) -- missing_perl_modules=yes -- else -- AC_MSG_RESULT([yes]) -- fi --done --if test "x$missing_perl_modules" = "xyes"; then -- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) --fi -- -+AC_ARG_ENABLE([perl], -+ AS_HELP_STRING([--disable-perl], [Disable Perl language bindings]), -+ [], -+ [enable_perl=yes]) -+AS_IF([test "x$enable_perl" != "xno"],[ -+ dnl Check for Perl modules that must be present to compile and -+ dnl test the Perl bindings. -+ missing_perl_modules=no -+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -+ AC_MSG_CHECKING([for $pm]) -+ if ! $PERL -M$pm -e1 >/dev/null 2>&1; then -+ AC_MSG_RESULT([no]) -+ missing_perl_modules=yes -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ done -+ if test "x$missing_perl_modules" = "xyes"; then -+ AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) -+ fi -+ ]) - AM_CONDITIONAL([HAVE_PERL], -- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) -+ [test "x$enable_perl" != "xno" && test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) - - dnl Check for Python (optional, for Python bindings). - PYTHON_PREFIX= -@@ -252,85 +268,111 @@ PYTHON_VERSION= - PYTHON_INCLUDEDIR= - PYTHON_INSTALLDIR= - --AC_CHECK_PROG([PYTHON],[python],[python],[no]) -- --if test "x$PYTHON" != "xno"; then -- AC_MSG_CHECKING([Python prefix]) -- PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` -- AC_MSG_RESULT([$PYTHON_PREFIX]) -- -- AC_MSG_CHECKING([Python version]) -- PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"` -- PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"` -- PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR" -- AC_MSG_RESULT([$PYTHON_VERSION]) -- -- AC_MSG_CHECKING([for Python include path]) -- if test -z "$PYTHON_INCLUDEDIR"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- PYTHON_INCLUDEDIR=$python_path -- fi -- AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) -- -- AC_ARG_WITH([python-installdir], -- [AS_HELP_STRING([--with-python-installdir], -- [directory to install python modules @<:@default=check@:>@])], -- [PYTHON_INSTALLDIR="$withval" -- AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])], -- [PYTHON_INSTALLDIR=check]) -- -- if test "x$PYTHON_INSTALLDIR" = "xcheck"; then -- PYTHON_INSTALLDIR= -- AC_MSG_CHECKING([for Python site-packages path]) -- if test -z "$PYTHON_INSTALLDIR"; then -- PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_lib(1,0));"` -+AC_ARG_ENABLE([python], -+ AS_HELP_STRING([--disable-python], [Disable Python language bindings]), -+ [], -+ [enable_python=yes]) -+AS_IF([test "x$enable_python" != "xno"], -+ [ -+ AC_CHECK_PROG([PYTHON],[python],[python],[no]) -+ -+ if test "x$PYTHON" != "xno"; then -+ AC_MSG_CHECKING([Python prefix]) -+ PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` -+ AC_MSG_RESULT([$PYTHON_PREFIX]) -+ -+ AC_MSG_CHECKING([Python version]) -+ PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"` -+ PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"` -+ PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR" -+ AC_MSG_RESULT([$PYTHON_VERSION]) -+ -+ AC_MSG_CHECKING([for Python include path]) -+ if test -z "$PYTHON_INCLUDEDIR"; then -+ python_path=`$PYTHON -c "import distutils.sysconfig; \ -+ print (distutils.sysconfig.get_python_inc ());"` -+ PYTHON_INCLUDEDIR=$python_path -+ fi -+ AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) -+ -+ AC_ARG_WITH([python-installdir], -+ [AS_HELP_STRING([--with-python-installdir], -+ [directory to install python modules @<:@default=check@:>@])], -+ [PYTHON_INSTALLDIR="$withval" -+ AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])], -+ [PYTHON_INSTALLDIR=check]) -+ -+ if test "x$PYTHON_INSTALLDIR" = "xcheck"; then -+ PYTHON_INSTALLDIR= -+ AC_MSG_CHECKING([for Python site-packages path]) -+ if test -z "$PYTHON_INSTALLDIR"; then -+ PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ -+ print (distutils.sysconfig.get_python_lib(1,0));"` -+ fi -+ AC_MSG_RESULT([$PYTHON_INSTALLDIR]) -+ fi -+ -+ dnl Look for some optional symbols in libpython. -+ old_LIBS="$LIBS" -+ -+ PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \ -+ print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"` -+ AC_CHECK_LIB([c],[PyCapsule_New], -+ [AC_DEFINE([HAVE_PYCAPSULE_NEW],1, -+ [Found PyCapsule_New in libpython])], -+ [],[$PYTHON_BLDLIBRARY]) -+ AC_CHECK_LIB([c],[PyString_AsString], -+ [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1, -+ [Found PyString_AsString in libpython])], -+ [],[$PYTHON_BLDLIBRARY]) -+ -+ LIBS="$old_LIBS" - fi -- AC_MSG_RESULT([$PYTHON_INSTALLDIR]) -- fi -- -- dnl Look for libpython and some optional symbols in it. -- old_LIBS="$LIBS" -- if test "x$PYTHON_VERSION_MAJOR" = "x3"; then -- dnl libpython3 is called "libpython3.Xmu.so" -- LIBPYTHON="python${PYTHON_VERSION}mu" -- else -- LIBPYTHON="python$PYTHON_VERSION" -- fi -- AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [], -- [AC_MSG_FAILURE([$LIBPYTHON is not installed])]) -- -- AC_CHECK_FUNCS([PyCapsule_New \ -- PyString_AsString]) -- LIBS="$old_LIBS" --fi -- --AC_SUBST(PYTHON_PREFIX) --AC_SUBST(PYTHON_VERSION) --AC_SUBST(PYTHON_INCLUDEDIR) --AC_SUBST(PYTHON_INSTALLDIR) - -+ AC_SUBST(PYTHON_PREFIX) -+ AC_SUBST(PYTHON_VERSION) -+ AC_SUBST(PYTHON_INCLUDEDIR) -+ AC_SUBST(PYTHON_INSTALLDIR) -+ ]) - AM_CONDITIONAL([HAVE_PYTHON], - [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) - - dnl Check for Ruby and rake (optional, for Ruby bindings). - AC_ARG_ENABLE([ruby], -- AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]), -- [], -- [enable_ruby=yes]) --AS_IF([test "x$enable_ruby" != "xno"], -- [ -- AC_CHECK_PROG([RUBY],[ruby],[ruby],[no]) -- AC_CHECK_PROG([RAKE],[rake],[rake],[no]) -- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) -- AC_SUBST(RAKE) -+ AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]), -+ [], -+ [enable_ruby=yes]) -+AS_IF([test "x$enable_ruby" != "xno"],[ -+ AC_CHECK_PROG([RUBY],[ruby],[ruby],[no]) -+ AC_CHECK_PROG([RAKE],[rake],[rake],[no]) -+ -+ AS_IF([test -n "$RUBY" && test -n "$RAKE"],[ -+ dnl Find the library. Note on Debian it's not -lruby. -+ AC_MSG_CHECKING([for C library for Ruby extensions]) -+ ruby_cmd='puts RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@' -+ echo running: $RUBY -rrbconfig -e \'$ruby_cmd\' >&AS_MESSAGE_LOG_FD -+ $RUBY -rrbconfig -e "$ruby_cmd" >conftest 2>&AS_MESSAGE_LOG_FD -+ libruby="$(cat conftest)" -+ rm conftest -+ AS_IF([test -n "$libruby"],[ -+ AC_MSG_RESULT([-l$libruby]) -+ AC_CHECK_LIB([$libruby],[ruby_init], -+ [have_libruby=1],[have_libruby=]) -+ -+ dnl Symbols that we substitute when missing. -+ AS_IF([test -n "$have_libruby"],[ -+ old_LIBS="$LIBS" -+ LIBS="$LIBS -l$libruby" -+ AC_CHECK_FUNCS([rb_hash_lookup]) -+ LIBS="$old_LIBS" -+ ]) -+ ],[ -+ AC_MSG_RESULT([not found]) - ]) -+ ]) -+]) - AM_CONDITIONAL([HAVE_RUBY], -- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) -- --AM_CONDITIONAL([HAVE_RUBY], -- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) -+ [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"]) - - dnl dnl Check for Java. - dnl AC_ARG_WITH(java_home, diff --git a/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch b/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch deleted file mode 100644 index 283d68897de5..000000000000 --- a/app-misc/hivex/files/1.3.6-r1/fix_python_linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python/Makefile.am 2012-06-12 14:12:50.000000000 +0400 -+++ python/Makefile.am 2012-09-17 16:21:55.230278577 +0400 -@@ -35,7 +35,7 @@ - libhivexmod_la_SOURCES = hivex-py.c - libhivexmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib --libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la -+libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la -lpython$(PYTHON_VERSION) - libhivexmod_la_LDFLAGS = -avoid-version -shared - - TESTS_ENVIRONMENT = \ diff --git a/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch deleted file mode 100644 index d82db8a1aff3..000000000000 --- a/app-misc/hivex/files/1.3.6/0001-add_ocaml_triplet_in_configure.ac.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -187,10 +187,12 @@ - AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"]) - - dnl Check for OCaml (optional, for OCaml bindings). -+AC_ARG_ENABLE([ocaml], -+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) - AC_PROG_OCAML - AC_PROG_FINDLIB - AM_CONDITIONAL([HAVE_OCAML], -- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]]) - AM_CONDITIONAL([HAVE_OCAMLOPT], - [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) - diff --git a/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch b/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch deleted file mode 100644 index f3339d2bd9f4..000000000000 --- a/app-misc/hivex/files/1.3.6/0002-add_per_triplet_in_configure.ac.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -245,8 +245,31 @@ - AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) - fi - -+AC_ARG_ENABLE([perl], -+ AS_HELP_STRING([--with-perl],[build Perl binding])) -+ -+ -+PERL= -+AS_IF([test "x$enable_perl" != "xno" ],[ -+ AC_CHECK_PROG([PERL],[perl],[yes],[no]) -+ -+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -+ AC_MSG_CHECKING([for $pm]) -+ if ! perl -M$pm -e1 >/dev/null 2>&1; then -+ AC_MSG_RESULT([no]) -+ missing_perl_modules=yes -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ done -+ -+ AS_IF([test "x$missing_perl_modules" = "xyes"], -+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], -+ ) -+]) -+ - AM_CONDITIONAL([HAVE_PERL], -- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) -+ [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) - - dnl Check for Python (optional, for Python bindings). - PYTHON_PREFIX= diff --git a/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch b/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch deleted file mode 100644 index d74b17c1e7c5..000000000000 --- a/app-misc/hivex/files/1.3.6/0003-fix_python_defenition_configure.ac.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -336,8 +336,11 @@ - AC_SUBST(PYTHON_INCLUDEDIR) - AC_SUBST(PYTHON_INSTALLDIR) - -+AC_ARG_ENABLE([python], -+ AS_HELP_STRING([--with-python],[build Python binding])) -+ - AM_CONDITIONAL([HAVE_PYTHON], -- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) -+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) - - dnl Check for Ruby and rake (optional, for Ruby bindings). - AC_ARG_ENABLE([ruby], diff --git a/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch deleted file mode 100644 index 25624c7104d1..000000000000 --- a/app-misc/hivex/files/1.3.6/0004-ruby_runpath_fix-1.3.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400 -+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400 -@@ -38,7 +38,7 @@ - # Build locally - - file MAKEFILE => EXT_CONF do |t| -- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" -+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" - $stderr.puts "Failed to run extconf" - break - end diff --git a/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch b/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch deleted file mode 100644 index 25624c7104d1..000000000000 --- a/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400 -+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400 -@@ -38,7 +38,7 @@ - # Build locally - - file MAKEFILE => EXT_CONF do |t| -- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" -+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" - $stderr.puts "Failed to run extconf" - break - end diff --git a/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch b/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch deleted file mode 100644 index defd14a4f700..000000000000 --- a/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/ruby/Makefile.am b/ruby/Makefile.am ---- a/ruby/Makefile.am -+++ b/ruby/Makefile.am -@@ -44,11 +44,11 @@ - RUBY=$(RUBY) RAKE=$(RAKE) - - all: -- $(RAKE) build -- $(RAKE) rdoc -+ $(RAKE) -v build -+ $(RAKE) -v rdoc - --RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']") --RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") -+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']") - - install: - $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) -diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in ---- a/ruby/Rakefile.in -+++ b/ruby/Rakefile.in -@@ -17,9 +17,9 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - require 'rake/clean' --require 'rake/rdoctask' -+require 'rdoc/task' - require 'rake/testtask' --require 'rake/gempackagetask' -+require 'rubygems/package_task' - - PKG_NAME='@PACKAGE_NAME@' - PKG_VERSION='@PACKAGE_VERSION@' -@@ -108,7 +108,7 @@ - EOF - end - --Rake::GemPackageTask.new(SPEC) do |pkg| -+Gem::PackageTask.new(SPEC) do |pkg| - pkg.need_tar = true - pkg.need_zip = true - end diff --git a/app-misc/hivex/files/autoconf_fix-1.3.2.patch b/app-misc/hivex/files/autoconf_fix-1.3.2.patch deleted file mode 100644 index 2a9495b51cea..000000000000 --- a/app-misc/hivex/files/autoconf_fix-1.3.2.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- configure.ac.orig 2011-08-15 22:29:28.309745342 +0300 -+++ configure.ac 2011-08-15 22:34:54.324549151 +0300 -@@ -170,11 +170,18 @@ - AC_SUBST([LIBXML2_CFLAGS]) - AC_SUBST([LIBXML2_LIBS]) - -+ -+dnl //////////////////////////////////////////////////////////////////////////// - dnl Check for OCaml (optional, for OCaml bindings). -+ -+AC_ARG_ENABLE([ocaml], -+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) -+ -+ - AC_PROG_OCAML - AC_PROG_FINDLIB - AM_CONDITIONAL([HAVE_OCAML], -- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) -+ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]) - AM_CONDITIONAL([HAVE_OCAMLOPT], - [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) - -@@ -207,6 +214,8 @@ - rm -f conftest conftest.* conftest_ml.* - fi - -+dnl /////////////////////////////////////////////////////////////////////////////////////// -+ - dnl Check for Perl (optional, for Perl bindings). - dnl XXX This isn't quite right, we should check for Perl devel library. - AC_CHECK_PROG([PERL],[perl],[perl],[no]) -@@ -214,21 +223,35 @@ - dnl Check for Perl modules that must be present to compile and - dnl test the Perl bindings. - missing_perl_modules=no --for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -- AC_MSG_CHECKING([for $pm]) -- if ! perl -M$pm -e1 >/dev/null 2>&1; then -- AC_MSG_RESULT([no]) -- missing_perl_modules=yes -- else -- AC_MSG_RESULT([yes]) -- fi --done --if test "x$missing_perl_modules" = "xyes"; then -- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) --fi -+ -+AC_ARG_ENABLE([perl], -+ AS_HELP_STRING([--with-perl],[build Perl binding])) -+ -+ -+PERL= -+AS_IF([test "x$enable_perl" != "xno" ],[ -+ AC_CHECK_PROG([PERL],[perl],[yes],[no]) -+ -+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do -+ AC_MSG_CHECKING([for $pm]) -+ if ! perl -M$pm -e1 >/dev/null 2>&1; then -+ AC_MSG_RESULT([no]) -+ missing_perl_modules=yes -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ done -+ -+ AS_IF([test "x$missing_perl_modules" = "xyes"], -+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], -+ ) -+]) -+ - - AM_CONDITIONAL([HAVE_PERL], -- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) -+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) -+ -+dnl ////////////////////////////////////////////////////////////////////////////////////////////////// - - dnl Check for Python (optional, for Python bindings). - AC_CHECK_PROG([PYTHON],[python],[python],[no]) -@@ -266,15 +289,21 @@ - AC_SUBST(PYTHON_INCLUDEDIR) - AC_SUBST(PYTHON_SITE_PACKAGES) - -+AC_ARG_ENABLE([python], -+ AS_HELP_STRING([--with-python],[build Python binding])) -+ - AM_CONDITIONAL([HAVE_PYTHON], -- [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"]) -+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) - - dnl Check for Ruby and rake (optional, for Ruby bindings). - AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) - AC_CHECK_PROG([RAKE],[rake],[rake],[no]) - -+AC_ARG_ENABLE([ruby], -+ AS_HELP_STRING([--with-ruby],[build Ruby binding])) -+ - AM_CONDITIONAL([HAVE_RUBY], -- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) -+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"]) - - dnl dnl Check for Java. - dnl AC_ARG_WITH(java_home, diff --git a/app-misc/hivex/files/python-test-fix-1.3.2.patch b/app-misc/hivex/files/python-test-fix-1.3.2.patch deleted file mode 100644 index 0b31e216e048..000000000000 --- a/app-misc/hivex/files/python-test-fix-1.3.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python/run-python-tests.in 2011-08-11 22:40:25.000000000 +0400 -+++ python/run-python-tests.in 2011-11-06 11:52:14.064248069 +0400 -@@ -19,7 +19,7 @@ - set -e - shopt -s nullglob - --for f in $(srcdir)t/*.py; do -+for f in ${srcdir}t/*.py; do - basename "$f" - @PYTHON@ "$f" - done diff --git a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch b/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch deleted file mode 100644 index 5b77ede9d5c2..000000000000 --- a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby/Rakefile.in.orig 2012-04-16 20:16:14.989449899 +0200 -+++ ruby/Rakefile.in 2012-04-16 20:17:08.006443779 +0200 -@@ -38,7 +38,7 @@ - # Build locally - - file MAKEFILE => EXT_CONF do |t| -- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" -+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" - $stderr.puts "Failed to run extconf" - break - end diff --git a/app-misc/hivex/hivex-1.3.2-r2.ebuild b/app-misc/hivex/hivex-1.3.2-r2.ebuild deleted file mode 100644 index 2b3dcd8ad42e..000000000000 --- a/app-misc/hivex/hivex-1.3.2-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.4 2014/11/16 20:25:35 dilfridge Exp $ - -EAPI=5 - -WANT_AUTOMAKE="1.11" -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 - -PYTHON_DEPEND="python? 2:2.6" -inherit base autotools-utils perl-app python - -DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files" -HOMEPAGE="http://libguestfs.org" -SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="ocaml readline perl python test static-libs ruby" - -RDEPEND="virtual/libiconv - virtual/libintl - dev-libs/libxml2:2 - ocaml? ( dev-lang/ocaml[ocamlopt] - dev-ml/findlib[ocamlopt] - ) - readline? ( sys-libs/readline ) - perl? ( dev-perl/IO-stringy ) - " - -DEPEND="${RDEPEND} - dev-lang/perl - perl? ( - test? ( dev-perl/Pod-Coverage - dev-perl/Test-Pod-Coverage ) ) - ruby? ( dev-ruby/rake ) - " -PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch -"${FILESDIR}"/python-test-fix-${PV}.patch -"${FILESDIR}"/ruby_runpath_fix-${PV}.patch) -DOCS=(README) - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - python_need_rebuild - fi -} - -src_prepare() { - sed -i -e '/gets is a security/d' gnulib/lib/stdio.in.h || die "sed failed" - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_with readline) - $(use_enable ocaml) - $(use_enable perl) - --enable-nls - $(use_enable python) - $(use_enable ruby) - --disable-rpath ) - - autotools-utils_src_configure -} - -src_test() { - autotools-utils_src_compile check -} - -src_install() { - strip-linguas -i po - - autotools-utils_src_install "LINGUAS=""${LINGUAS}""" - - if use perl; then - perl_delete_localpod - fi -} diff --git a/app-misc/hivex/hivex-1.3.7-r1.ebuild b/app-misc/hivex/hivex-1.3.7-r1.ebuild deleted file mode 100644 index 09cac6c66898..000000000000 --- a/app-misc/hivex/hivex-1.3.7-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7-r1.ebuild,v 1.4 2015/01/05 19:44:24 graaff Exp $ - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -WANT_AUTOMAKE=1.11 - -USE_RUBY="ruby19" -RUBY_OPTIONAL=yes -PYTHON_DEPEND="python? 2:2.6" -SUPPORT_PYTHON_ABIS=1 - -inherit base autotools autotools-utils eutils perl-app ruby-ng python - -DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files" -HOMEPAGE="http://libguestfs.org" -SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ocaml readline +perl python test static-libs ruby" - -RDEPEND=" - virtual/libiconv - virtual/libintl - dev-libs/libxml2:2 - ocaml? ( dev-lang/ocaml[ocamlopt] - dev-ml/findlib[ocamlopt] - ) - readline? ( sys-libs/readline ) - perl? ( dev-perl/IO-stringy ) - ruby? ( $(ruby_implementations_depend) ) - " - -DEPEND="${RDEPEND} - dev-lang/perl - perl? ( - test? ( dev-perl/Pod-Coverage - dev-perl/Test-Pod-Coverage ) - ) - " - -ruby_add_bdepend "ruby? ( dev-ruby/rake )" -ruby_add_bdepend "ruby? ( dev-ruby/rdoc )" - -DOCS=(README) -PATCHES=("${FILESDIR}"/"${PV}"/*.patch) - -S="${WORKDIR}/${P}" - -pkg_setup() { - if use python; then - python_pkg_setup - fi - if use perl; then - perl_set_version - fi -} - -src_unpack() { - default -} - -src_prepare() { - base_src_prepare - eautomake -} - -src_configure() { - local myeconfargs=( - $(use_with readline) - $(use_enable ocaml) - $(use_enable perl) - --enable-nls - $(use_enable python) - $(use_enable ruby) - --disable-rpath ) - - autotools-utils_src_configure - - if use perl; then - pushd perl - perl-app_src_configure - popd - fi -} - -src_compile() { - autotools-utils_src_compile -} - -src_test() { - if use perl;then - pushd perl - perl-app_src_install - popd - fi - - autotools-utils_src_compile check -} - -src_install() { - strip-linguas -i po - - autotools-utils_src_install "LINGUAS=""${LINGUAS}""" - - if use perl; then - perl_delete_localpod - fi - if use python; then - compile_and_install() { - emake -C python clean - emake -C python PYTHON_VERSION="${PYTHON_ABI}" \ - PYTHON_INCLUDEDIR="$(python_get_includedir)" \ - PYTHON_INSTALLDIR="$(python_get_sitedir)" \ - DESTDIR="${ED}" install - } - python_execute_function compile_and_install - fi -} |