delete old ebuilds

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2685 6952d904-891a-0410-993b-d76249ca496b
2010-11-07 06:47:25 +00:00 · 2010-11-07 06:47:25 +00:00 · 376e917bd3
commit 376e917bd3
parent de3fbb764b
157 changed files with 14 additions and 10930 deletions
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@ -4,6 +4,7 @@ DIST irclient-src-5.11.04.tar.gz 44123 RMD160 d756a3655b82085430e26e194271ddc150
 DIST irclient-src-6.00.04.tar.gz 65931 RMD160 e88fc0d454c5177ea4005e1301b2d67f8a15d5da SHA1 6db986ce4db58e7d91b8fad0232d41b4614d5617 SHA256 c58acec89daabd8dc98ed163602c39e3c94a61625b01663a522a77c9dd9c0e30
 DIST irclient-src-6.01.01.tar.gz 65976 RMD160 fead5256bf5c7b4b89109125116c0654db390aba SHA1 70e8bce66ad1254d241b4ae673820209c14f7e47 SHA256 fc9e55bae94bf26a2bbc1f2fcdaa9efa2309c0361ab9423e1ed772b449307c84
 DIST irclient-src-6.01.04.tar.gz 68860 RMD160 a42758bd1f63606192499a05db7cbeaf932b71af SHA1 c0261a80845a63a88128b8be3bf7f3222c12e1db SHA256 dd0dd20cbbf3643ea87615c5eab4eef4122c55bc45616d9cd255e9da65bc7247
 DIST irclient-src-6.01.05.tar.gz 69814 RMD160 9a3840db5089a993087b2cd918f55ec577a1c447 SHA1 bce3a9fcec1a22b147dc882ea27c7396b9d05f1f SHA256 c37fdff95794e343505f57ad5782a3100c3a3a572c3ab8064fe93de94b00efca
 DIST irserver-src-5.9.04.tar.gz 143574 RMD160 acea7223dea66d8be97e716d0a1aa2f128f98176 SHA1 d3f6687785bab24abb5cd5019ef5d6892ced7b1f SHA256 9f3877d6c8fcc67b5198bb05c2ffab24116121c09124f744eb9d795e925485a9
 DIST irserver-src-5.9.07.tar.gz 143809 RMD160 747eeb70f5f869f689517250bcfd75fe0af1d924 SHA1 49210d5adebba6852439cfb4e640434303b0a83f SHA256 2416be01cc7f2bc32fc71407d503c1c285987d32e0dab905921c639d2fd79702
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 RMD160 0b04bd863acaf0a7d1b06434efc3494ed4b74c70 SHA1 68b891c132e6aff50bfac22635c9a360ed9d0eea SHA256 094ee33b2a7a7fb4752bda0896a7a23895fa8eba86164fe9e0c4e63790e34739
@ -14,5 +15,6 @@ EBUILD irtrans-irclient-5.9.07.ebuild 858 RMD160 dd47ec80a7e88307638b85188227b76
 EBUILD irtrans-irclient-6.00.04.ebuild 1642 RMD160 108190b93ba1b524fbff53f24f08262148596182 SHA1 8435ba5017684efc7683ca1f866ab858f5ae5a3a SHA256 2d3d437798df46718f0c956ea168642ac6a53f0d9e1a477611d5d9542d9b01e6
 EBUILD irtrans-irclient-6.01.01.ebuild 1657 RMD160 787efba3bca4a983292d19dfc1b3ceaa95410ad1 SHA1 c0a640a13283e3edfe9058c5495e2d83ba5060ac SHA256 6c9fa917e60b6854121fb71409e600ffc9bed4d26634c22cc26a625a7e55580c
 EBUILD irtrans-irclient-6.01.04.ebuild 1657 RMD160 920fa7a95e17f600b38af60802e090e128ff41b4 SHA1 da69c0a44a86f778ab32e2b5f43644c3d18a614b SHA256 e4a612725eb36d1e67082c428f19fd301a64afeda626cc1e45b4e4ffcb431fee
 EBUILD irtrans-irclient-6.01.05.ebuild 1657 RMD160 920fa7a95e17f600b38af60802e090e128ff41b4 SHA1 da69c0a44a86f778ab32e2b5f43644c3d18a614b SHA256 e4a612725eb36d1e67082c428f19fd301a64afeda626cc1e45b4e4ffcb431fee
 MISC ChangeLog 2658 RMD160 29f946cedfb4924872463dc13dd57fff6f6d56d2 SHA1 c32495b89e25da26f03ced789be61f9ad27bc769 SHA256 ae29d225e94153059db1558533908ad4f6bff18ba8f1d28659a67b530a319914
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@ -18,6 +18,7 @@ DIST irserver-src-6.02.43.tar.gz 167019 RMD160 cee5351ef55bd8642e55d9757715f459d
 DIST irserver-src-6.02.59.tar.gz 171774 RMD160 4ed157f1a0fc2a7f905d09b756dcd6ead34387d5 SHA1 5dc733aab1fc44f061b86365601029d21c8c5595 SHA256 29482f89fd89154ab8ad0c8bdf1ee30d1af61b67b8ea9742941db809079fd98e
 DIST irserver-src-6.02.70.tar.gz 173186 RMD160 7ee2aa7c2a39a0abd45d6fac299de706214850eb SHA1 25260b6133ba0b3667db86c05a637570866d6a9e SHA256 f8516fe35c9849425d1e40785125a5c9836bf36e898f72aa85ecb05df83d7d34
 DIST irserver-src-6.02.82.tar.gz 174335 RMD160 e5a8a0b82f3257d83ffeb5276481a598fafb5496 SHA1 163a31b427632dc51e0c15aad02c25e4700db443 SHA256 1cdcd7c15649dee9db28354f81aeb1989866a7fa48d1aa2d6e3bfdc23d693161
 DIST irserver-src-6.03.02.tar.gz 176622 RMD160 01892d048ec10892509e69ee298d4cb1e31693a6 SHA1 c23649f75915d16c995a382cb5e78981cbffd716 SHA256 40430b92c8fd14bcd55fa14a62be845ed7693843c0e54e3e64b2418346583e7e
 DIST irtrans-irserver-5.11.08-arm_remotes-1.patch.bz2 4918 RMD160 311bad27adfee35278cb36c3d62be014544f2bac SHA1 82ecd9fea280134f738a9cfac5bb6e187140686a SHA256 c30b69c4a3461bc35d66885757f33f009dc0c4d3210ebf695abd5da103e9adc0
 EBUILD irtrans-irserver-5.11.08.ebuild 1457 RMD160 5e39d41416bcae24e7dd07b8d08211cc1185c362 SHA1 ff0db83c85796c8268834f72adbeb5eccf5ba078 SHA256 3e8cf6b4dc38d6b10a7b75b31ef073a449feaffa4da23c735f29f216d9fea540
 EBUILD irtrans-irserver-5.11.10.ebuild 1457 RMD160 5e39d41416bcae24e7dd07b8d08211cc1185c362 SHA1 ff0db83c85796c8268834f72adbeb5eccf5ba078 SHA256 3e8cf6b4dc38d6b10a7b75b31ef073a449feaffa4da23c735f29f216d9fea540
@ -36,5 +37,6 @@ EBUILD irtrans-irserver-6.02.43.ebuild 1397 RMD160 70d94a5df1ea4463be98be6da1b01
 EBUILD irtrans-irserver-6.02.59.ebuild 1467 RMD160 1283eb8d505ce45325186aa06507324793f2ce70 SHA1 280771c75f7ccd80c97fc92f80ac1a01d45997f1 SHA256 7b143bd2776f97212e0664858f295f58971df9f57978e4a0c05046f0abb3dede
 EBUILD irtrans-irserver-6.02.70.ebuild 1467 RMD160 1283eb8d505ce45325186aa06507324793f2ce70 SHA1 280771c75f7ccd80c97fc92f80ac1a01d45997f1 SHA256 7b143bd2776f97212e0664858f295f58971df9f57978e4a0c05046f0abb3dede
 EBUILD irtrans-irserver-6.02.82.ebuild 1467 RMD160 1283eb8d505ce45325186aa06507324793f2ce70 SHA1 280771c75f7ccd80c97fc92f80ac1a01d45997f1 SHA256 7b143bd2776f97212e0664858f295f58971df9f57978e4a0c05046f0abb3dede
 EBUILD irtrans-irserver-6.03.02.ebuild 1467 RMD160 1283eb8d505ce45325186aa06507324793f2ce70 SHA1 280771c75f7ccd80c97fc92f80ac1a01d45997f1 SHA256 7b143bd2776f97212e0664858f295f58971df9f57978e4a0c05046f0abb3dede
 MISC ChangeLog 3640 RMD160 0c38d07085cf89122f069f8c213d22376b4380f1 SHA1 d9351751b77a7b2f74c255beb1a3639139e8b018 SHA256 598bd8853fe8cfa6f30603d763b2f0757f72c25253e98b08e2a0d0a4dab05c54
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -1,44 +0,0 @@
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gcc45-buildfix.diff 840 RMD160 fcb6c08ee67b61f60641d641daa329d5fd17772b SHA1 6344952a2d0d9690d4f864b3273713f95068eabd SHA256 2d5b95e94f9b9e95c97876db669aabe523d01194c9f7ce2f0a3ccb9bde9221bc
 AUX gentoo-3.2.99.1.diff 1599 RMD160 0d839728f2a9c28a3e7adc22b27b7f48b661f3a4 SHA1 734ad3392effaaf4007f88fc110037b41d0484bc SHA256 f471da49a10042fc9066a1cd8b0550983c1446a9304b8acbeef9a3ab8393ac1e
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc569 SHA1 148a3431222e7405eb16c42330da7f0a2f01e1eb SHA256 f3ba5e9390f47d42acb955c04f5ef62a5b62a5776bd9d5d3226d5034fafe6be9
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
 DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
 DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5
 DIST Sun_ODF_Template_Pack_hu.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
 DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e14cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA1 fb7d85a9827cd1280766db2641fb1896bd5d1c7b SHA256 6cf85181c21dadda4fa4d8fbc227012d63a2558642195a46b0ae2ab144facce8
 DIST libreoffice-artwork-3.2.99.1.tar.bz2 22364562 RMD160 715ac5bdc2fb61f4e3f26bf53a14dcd4d15bdf36 SHA1 42066401ccea56752bc2701fa5166ee33334775e SHA256 ee498f2c4ba06047885000cc0d0924d202be9d3393afe39bb9eaba6eeeab5266
 DIST libreoffice-base-3.2.99.1.tar.bz2 2097276 RMD160 bedab97c61c83e9b41948c32be7da6159497c8cd SHA1 aa78a8bf0d44681327ec56eb95f47d09bf10d5cd SHA256 fb32937ba309a311e29c146253a5f479426cffc35c838f9264d5c21f6f76e25a
 DIST libreoffice-bootstrap-3.2.99.1.tar.bz2 2679321 RMD160 e7dab3b7862d4b5df1c806809fa79e3d3ae01532 SHA1 0bb33f173f26834a56fc4609be04b561008657cc SHA256 cab47dece0d32599fcbe09063ad55b4527790c2a28825c246b3e4b76c18f03cf
 DIST libreoffice-build-3.2.99.1.tar.gz 13215683 RMD160 13c3253aa9cce0eb33dc46a5acdcc3e63778ab9f SHA1 9c22674f72b76c93cf489505a9fdf9138da0969a SHA256 cd1340f98e099a944ba99a6eb8baa4819a4fa5b45c9b9f59fff1f9746197055d
 DIST libreoffice-calc-3.2.99.1.tar.bz2 9386130 RMD160 f94382cd1a7fbcb68683041accd004c0a831ebf0 SHA1 18d1146e0a78e1d8276303b4def00714e3f93e47 SHA256 c24f663f57eb32f233313267f91b1bea70cad72b7d691473567d60e28f289da9
 DIST libreoffice-components-3.2.99.1.tar.bz2 5087496 RMD160 fb6b0640b21c2f634db724bb918f14ab1db09fb7 SHA1 e9337b40965ca4b835ee4199f0e1f8fe7681c198 SHA256 09a6033e15988f6a78fc03189028fc1228edfb089f18bdd5ac37376083d99b71
 DIST libreoffice-extensions-3.2.99.1.tar.bz2 4222229 RMD160 d99e567f56fc49d307d459e5abebea9417833ec0 SHA1 3b84214eafc53ae6b03103e5d9f80251c8c9a401 SHA256 8412b07e1694a9992a5262cf3299fbc7da1bdf856f9179d46dc970cb71039458
 DIST libreoffice-extras-3.2.99.1.tar.bz2 46312670 RMD160 d245095e8d25933b42d456939e1efeb0b434aff9 SHA1 f481166ef05612a95dc2aa588f0f8cb4c9b169d0 SHA256 1089e5aec62e5dabe2bb986b5261b7f99c4c6a9a7aaecc6a669e7c543e6dae68
 DIST libreoffice-filters-3.2.99.1.tar.bz2 11608404 RMD160 a8a72145fe2c340c3efb157504bbc1d6fff03b59 SHA1 e52bbed3ba3e0f1466ab4b359d7e9ad65ce23dec SHA256 3a8a1156a4ce91c4f72b5df843abc59025256cc7f925a9cc5bccc677b9734c60
 DIST libreoffice-help-3.2.99.1.tar.bz2 1916317 RMD160 76ce9709cce8626da4c7862b7b4f2fa9a2f29589 SHA1 5a6d891ab3de4af49651c95f527895fb37324cb3 SHA256 2bdc06b5b85db1e1fedb93270dd4bd5f2ea7da2a97049e65da75104d07b80a65
 DIST libreoffice-impress-3.2.99.1.tar.bz2 2569552 RMD160 cf5a25606bdb873d9a8f2eb2d5995b873e5256b8 SHA1 2b7c4db0bf713d0c7759099678ff48cd8f578a4b SHA256 5c1342b317291fd1e7d1870310ccdad065204568cea006b1156d11b95e771df8
 DIST libreoffice-l10n-3.2.99.1.tar.bz2 78321565 RMD160 665162bdf3b321530edc3dbd5a4106d3e4dd66f4 SHA1 da32e11367a2b30f2eb3f25770a75b6b412fa26c SHA256 003ad9173d4551b6ae321e2c01c24dcbdafc11e974dc3faf527d49c9c034d40b
 DIST libreoffice-libs-core-3.2.99.1.tar.bz2 17100616 RMD160 5e8cb10eb9b633077f0bd572ede8c1d878b6bd3c SHA1 88c28fdeaa3c989098815bc36d8f5f90d398fd5d SHA256 789cc1da153a7b958a28f5e849e27e551c05c5d7d7cddb48483b51906cd83c17
 DIST libreoffice-libs-extern-3.2.99.1.tar.bz2 808309 RMD160 b8b4dba505315f9b2dc0af62a50b913cef9373f1 SHA1 d167125c1c40bff757375bb46def61a07d6eea03 SHA256 b7c61148689a1ce54f2bdaf7acbaa7efe80010070f443db0b713b850132c78aa
 DIST libreoffice-libs-extern-sys-3.2.99.1.tar.bz2 38493824 RMD160 3de5ade9b4329b49d7af44d4f7e7674b01406430 SHA1 643237f89370ce59d5378ceff492c69bf0ce1e90 SHA256 1533dd49fd1f2623f8581f9ba256d0e85bf6dd9236c711435b786fd1916253dd
 DIST libreoffice-libs-gui-3.2.99.1.tar.bz2 11396984 RMD160 89f071d17745b0fc8a5a65992582ecc05cbc6845 SHA1 07807d2bda6a056387b171ddf025a7cb7a22d7f3 SHA256 e20c603817ea01591d2423902af1aef39ab0ea14b36f640ae05cd1dcdd3e1378
 DIST libreoffice-postprocess-3.2.99.1.tar.bz2 41381 RMD160 26f057a5c1ca966d4cdbd0ea9a8918a7d9ae4206 SHA1 b1a89e95774dd9a2993c218f6f2b893194ff2453 SHA256 4f0dd079db8f1cf9ae33aa55f5e460579f1f157b125edeee20891ffb36ced9fe
 DIST libreoffice-sdk-3.2.99.1.tar.bz2 1706263 RMD160 45c74a6fc8681e8f134e14ea2563689f3c3386aa SHA1 665040404a7c81a6c7b7c74cc8aa2a1378b29d37 SHA256 6bdb46dd362535df6b053ed2a45852666fe0a8a0b9567562014f9922f616b315
 DIST libreoffice-testing-3.2.99.1.tar.bz2 50788204 RMD160 e3b343321a54c46362dd4744f3fb31bdd5cadad3 SHA1 d8e25524224aeb78b21fbf098197d7af835d1422 SHA256 a564b5146521cd15a1cae53193393683b9b2111eb5e54abbaaf56e06793ba9a6
 DIST libreoffice-ure-3.2.99.1.tar.bz2 6152768 RMD160 721ed9ccc594eb4c4421936c589b5c51bae4dc2e SHA1 ecc3a16c73a62900475a6b2afe306033d2354f9f SHA256 64a9930e226f2796a94c79baade88db3afc28aa845ccfc5d172208642e4cccbb
 DIST libreoffice-writer-3.2.99.1.tar.bz2 6759647 RMD160 0b2671d17f0236dd1fad7b91eac526157db1fb5f SHA1 1ca543652935dbec9acc44a0dfe32cadd1ee0343 SHA256 9f7d3c62fb5b4dc358a486ba7c1c2550867129982b3bdbdd27f9e4c5b824b1ec
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST mdds_0.3.0.tar.bz2 43041 RMD160 76d894e8f083d03ef1795e9c4c764c4b20c90a3a SHA1 3a1d839b9a36287074c3724fa16ac1e04d343fbe SHA256 4d28548468bb63edf630ebfc8c14f80531f12265f8fa5694c01b401594d01dff
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.2.99.1.ebuild 13779 RMD160 8084a74317d5575a7ecbb05970e4c076c6853733 SHA1 a72d62dec7e0b3b67bdff5f3700f1f41522df300 SHA256 90e4d1b6e6c08cd473a61d2b810e85356029176668d3be35ca4b9adfbdfd416f
--- a/app-office/libreoffice/files/boost-undefined-references.diff
+++ b/app-office/libreoffice/files/boost-undefined-references.diff
@ -1,12 +0,0 @@
 --- sc/source/core/tool/makefile.mk-orig	2009-09-07 20:15:14.880679704 -0500
 +++ sc/source/core/tool/makefile.mk	2009-09-07 20:14:38.941679215 -0500
@@ -132,7 +132,8 @@
         $(SLO)$/prnsave.obj \
 		$(SLO)$/reftokenhelper.obj \
 		$(SLO)$/stringutil.obj \
 -		$(SLO)$/token.obj
 +		$(SLO)$/token.obj \
 +	$(SLO)$/detfunc.obj
 # [kh] POWERPC compiler problem
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
--- a/app-office/libreoffice/files/gcc45-buildfix.diff
+++ b/app-office/libreoffice/files/gcc45-buildfix.diff
@ -1,17 +0,0 @@
 --- cppu/inc/uno/lbnames.h.old	2010-02-02 12:49:41.000000000 +0100
 +++ cppu/inc/uno/lbnames.h	2010-03-05 17:13:22.000000000 +0100
@@ -62,12 +62,12 @@ provoking error here, because PP ignores
 #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
 #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
 #define __CPPU_ENV gcc3
 -#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
 +#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
 #define __CPPU_ENV gcc3
 #elif (__GNUC__ == 3)
 #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
 #else
 -#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
 +#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
 #endif /* defined (__GNUC__) */
 #endif /* defined (_MSC_VER) */
--- a/app-office/libreoffice/files/gentoo-3.2.99.1.diff
+++ b/app-office/libreoffice/files/gentoo-3.2.99.1.diff
@ -1,46 +0,0 @@
 diff -uNr libre.orig//configure.in libre/configure.in
 --- libre.orig//configure.in	2010-09-29 18:48:36.000000000 +0200
 +++ libre/configure.in	2010-09-29 18:54:56.000000000 +0200
@@ -1349,12 +1349,18 @@
         done
     fi
     SUNTEMPLATES_LANG=
 -    # check whether the langs are requested at all
 -    for lang in $wanted_sun_templates ; do
 -        if test -n "`echo $with_lang | grep "$lang"`" ; then
 -                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
 -        fi
 -    done
 +
 +    # --with-lang="" now used for en-US
 +    if test "z$with_lang" = "z" ; then
 +        SUNTEMPLATES_LANG="en-US"
 +    else
 +        # check whether the langs are requested at all
 +        for lang in $wanted_sun_templates ; do
 +           if test -n "`echo $with_lang | grep "$lang"`" ; then
 +                 SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
 +           fi
 +        done
 +    fi
     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 fi
 AC_SUBST(SUNTEMPLATES_LANG)
 diff -uNr libre.orig//patches/dev300/apply libre/patches/dev300/apply
 --- libre.orig//patches/dev300/apply	2010-09-29 18:48:37.000000000 +0200
 +++ libre/patches/dev300/apply	2010-09-29 18:49:19.000000000 +0200
@@ -1019,14 +1019,10 @@
 [ GentooOnly ]
 SectionOwner => aprosky
 -# Allow build to proceed with PaX enabled
 -gentoo-pax-fix.diff, aprosky
 # support server-only versions of 64bit JDKs
 64bit-jdk-server-paths.diff, i#65974, hmth
 # use IBM j9vm over IBM classic JVM
 ibm-j9vm.diff, hmth
 -# system db check
 -system-db-check.diff, i#65979, hmth
 # User ~/.ooo3 as user dir
 scp2-user-config-ooo3.diff, pmladek
 # default inc/lib
--- a/app-office/libreoffice/files/gentoo-pythonpath.diff
+++ b/app-office/libreoffice/files/gentoo-pythonpath.diff
@ -1,11 +0,0 @@
 --- bin/package-ooo 
 +++ bin/package-ooo 
@@ -33,6 +33,7 @@
 {
     cat <<EOT >$1
 #!/bin/sh
 +unset PYTHONPATH
 $OOINSTBASE/program/soffice $2 "\$@"
 EOT
     chmod 755 $1
--- a/app-office/libreoffice/files/neon-remove-SSPI-support.diff
+++ b/app-office/libreoffice/files/neon-remove-SSPI-support.diff
@ -1,25 +0,0 @@
 --- ucb/source/ucp/webdav/NeonSession.cxx
 +++ ucb/source/ucp/webdav/NeonSession.cxx
@@ -257,9 +257,6 @@
 // -------------------------------------------------------------------
 extern "C" int NeonSession_NeonAuth( void *       inUserData,
 -#ifdef NE_FEATURE_SSPI
 -                                     const char * inAuthProtocol,
 -#endif
                                      const char * inRealm,
                                      int          attempt,
                                      char *       inoutUserName,
@@ -334,12 +331,6 @@
     bool bCanUseSystemCreds = false;
 -#ifdef NE_FEATURE_SSPI
 -    bCanUseSystemCreds = (attempt == 0) && // avoid endless loops
 -                         ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. 
 -                         ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
 -                         ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 );
 -#endif
 	// #i97003# (tkr): Ask XMasterPasswordHandling if we should store the 
     // credentials persistently and give this information to the auth listener
--- a/app-office/libreoffice/files/npwrap-fix-nogtk.diff
+++ b/app-office/libreoffice/files/npwrap-fix-nogtk.diff
@ -1,12 +0,0 @@
 --- extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:31:31.000000000 +0300
 +++ extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:32:04.000000000 +0300
@@ -485,7 +485,9 @@
     medDebug( 1, "left plugin app main loop\n" );
 +    #ifdef ENABLE_GTK
     g_source_remove(xt_polling_timer_id);
 +    #endif
     pNP_Shutdown();
     medDebug( 1, "NP_Shutdown done\n" );
--- a/app-office/libreoffice/files/ooo-env_log.diff
+++ b/app-office/libreoffice/files/ooo-env_log.diff
@ -1,25 +0,0 @@
 --- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
 +++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
@@ -21,9 +21,8 @@
 echo "configuring ...";
 autoconf || exit 1;
 -echo "Env for configure:"
 -set
 -echo "Env for configure ends"
 +echo "Log Env for configure to `pwd`/env.log"
 +set > env.log
 eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
@@ -88,8 +88,8 @@
 # similar that gives child nmake's pain.
 unset MAKEFLAGS
 -echo "Env:"
 -set
 +echo "Log Env to `pwd`/env.log"
 +set > env.log
 # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
 # already merged?
--- a/app-office/libreoffice/files/qt-use-native-backend.diff
+++ b/app-office/libreoffice/files/qt-use-native-backend.diff
@ -1,10 +0,0 @@
 *** vcl/unx/kde4/KDEXLib.cxx_	2010-02-21 22:34:18.917502324 +0200
 --- vcl/unx/kde4/KDEXLib.cxx	2010-02-21 22:35:29.642770570 +0200
 ***************
 *** 134,137 ****
 --- 134,138 ----
  	KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
 + 	KApplication::setGraphicsSystem( "native" );
  	m_pApplication = new VCLKDEApplication();
  	kapp->disableSessionManagement();
--- a/app-office/libreoffice/libreoffice-3.2.99.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.2.99.1.ebuild
@ -1,421 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.2.1.ebuild,v 1.4 2010/09/17 10:49:59 scarabeus Exp $
 WANT_AUTOMAKE="1.9"
 EAPI="2"
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads"
 inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
 IUSE="binfilter junit cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
 MY_PV=3.2.99.1
 PATCHLEVEL=OOO320
 SRC=libreoffice
 MST=OOO320_m19
 DEVPATH=http://download.documentfoundation.org/libreoffice/src/${SRC}
 S=${WORKDIR}/libre
 S_OLD=${WORKDIR}/libreoffice-build-${MY_PV}
 CONFFILE=${S}/distro-configs/Gentoo.conf.in
 BASIS=basis3.2
 DESCRIPTION="libreoffice, a full office productivity suite."
 SRC_URI="${DEVPATH}-artwork-${PV}.tar.bz2
 	${DEVPATH}-base-${PV}.tar.bz2
 	${DEVPATH}-bootstrap-${PV}.tar.bz2
 	${DEVPATH}-calc-${PV}.tar.bz2
 	${DEVPATH}-components-${PV}.tar.bz2
 	${DEVPATH}-extensions-${PV}.tar.bz2
 	${DEVPATH}-filters-${PV}.tar.bz2
 	${DEVPATH}-help-${PV}.tar.bz2
 	${DEVPATH}-impress-${PV}.tar.bz2
 	${DEVPATH}-l10n-${PV}.tar.bz2
 	${DEVPATH}-libs-core-${PV}.tar.bz2
 	${DEVPATH}-libs-extern-${PV}.tar.bz2
 	${DEVPATH}-libs-extern-sys-${PV}.tar.bz2
 	${DEVPATH}-libs-gui-${PV}.tar.bz2
 	${DEVPATH}-postprocess-${PV}.tar.bz2
 	${DEVPATH}-sdk-${PV}.tar.bz2
 	${DEVPATH}-testing-${PV}.tar.bz2
 	${DEVPATH}-ure-${PV}.tar.bz2
 	${DEVPATH}-writer-${PV}.tar.bz2
 	${DEVPATH}-extras-${PV}.tar.bz2
 	binfilter? ( ${DEVPATH}-extras-${PV}.tar.bz2 )
 	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
 		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
 		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
 		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
 		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt
 		ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt )
 	${DEVPATH}-build-${MY_PV}.tar.gz
 	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://download.go-oo.org/SRC680/extras-3.tar.bz2
 	http://download.go-oo.org/SRC680/biblio.tar.bz2
 	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
 	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
 	http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
 	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
 	http://multidimalgorithm.googlecode.com/files/mdds_0.3.0.tar.bz2"
 LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
 LANGS="${LANGS1} en en_US"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
 # intersection of available linguas and app-dicts/myspell-* dictionaries
 SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb nl nn pl pt ru sk sl sv tn zu"
 SPELL_DIRS_DEPEND=""
 for X in ${SPELL_DIRS} ; do
 	SPELL_DIRS_DEPEND="${SPELL_DIRS_DEPEND} linguas_${X}? ( app-dicts/myspell-${X} )"
 done
 HOMEPAGE="http://go-oo.org"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 COMMON_DEPEND="!app-office/libreoffice-bin
 	x11-libs/libXaw
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	>=dev-lang/perl-5.0
 	>=dev-libs/glib-2.18
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	gnome? ( >=x11-libs/gtk+-2.10
 		>=gnome-base/gconf-2.0
 		>=gnome-base/gnome-vfs-2.6
 		>=x11-libs/cairo-1.0.2 )
 	gtk? ( >=x11-libs/gtk+-2.10
 		>=x11-libs/cairo-1.0.2 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	gstreamer? ( >=media-libs/gstreamer-0.10
 			>=media-libs/gst-plugins-base-0.10 )
 	java? ( >=dev-java/bsh-2.0_beta4
 		dev-java/lucene:2.3
 		dev-java/lucene-analyzers:2.3
 		dev-java/rhino:1.5 )
 	nsplugin? ( net-libs/xulrunner:1.9
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	opengl? ( virtual/opengl )
 	>=net-libs/neon-0.24.7
 	>=dev-libs/openssl-0.9.8g
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.3.0
 	cups? ( net-print/cups )
 	media-libs/jpeg
 	media-libs/libpng
 	app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
 	>=dev-libs/icu-4.0
 	>=sys-libs/db-4.3
 	>=app-text/libwpd-0.8.8
 	>=media-libs/vigra-1.4
 	>=app-text/poppler-0.12.3-r3[xpdf-headers]
 	>=media-libs/libwpg-0.1.3"
 RDEPEND="java? ( >=virtual/jre-1.5 )
 	${SPELL_DIRS_DEPEND}
 	${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-proto/printproto
 	x11-proto/xextproto
 	x11-proto/xproto
 	x11-proto/xineramaproto
 	>=sys-apps/findutils-4.1.20-r1
 	dev-perl/Archive-Zip
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.36
 	sys-devel/flex
 	sys-devel/bison
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.0
 	>=dev-util/gperf-3
 	>=net-misc/curl-7.12
 	sys-libs/zlib
 	sys-apps/coreutils
 	pam? ( sys-libs/pam
 		sys-apps/shadow[pam] )
 	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
 		junit? ( dev-java/junit:4 )
 		>=dev-java/ant-core-1.7 )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/ooo"
 pkg_setup() {
 	ewarn
 	ewarn " It is important to note that libreoffice is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
 	ewarn " package and use aggressive CFLAGS, lower the CFLAGS and try to  "
 	ewarn " merge again. "
 	ewarn
 	ewarn " Also if you experience a build break, please make sure to retry "
 	ewarn " with MAKEOPTS="-j1" before filing a bug. "
 	ewarn
 	# Check if we have enough RAM and free diskspace to build this beast
 	CHECKREQS_MEMORY="512"
 	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
 	check_reqs
 	strip-linguas ${LANGS}
 	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
 	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
 	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
 		export LINGUAS_OOO=""
 	else
 		# always build en-US as a fallback (needed for broken code / translations)
 		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
 	fi
 	if use !java; then
 		ewarn " You are building with java-support disabled, this results in some "
 		ewarn " of the libreoffice functionality being disabled. "
 		ewarn " If something you need does not work for you, rebuild with "
 		ewarn " java in your USE-flags. "
 		ewarn
 	fi
 	if use !gtk && use !gnome; then
 		ewarn " If you want the libreoffice systray quickstarter to work "
 		ewarn " activate either the 'gtk' or 'gnome' use flags. "
 		ewarn
 	fi
 	if is-flagq -ffast-math ; then
 		eerror " You are using -ffast-math, which is known to cause problems. "
 		eerror " Please remove it from your CFLAGS, using this globally causes "
 		eerror " all sorts of problems. "
 		eerror " After that you will also have to - at least - rebuild python otherwise "
 		eerror " the libreoffice build will break. "
 		die
 	fi
 	java-pkg-opt-2_pkg_setup
 	# sys-libs/db version used
 	local db_ver=$(db_findver '>=sys-libs/db-4.3')
 	kde4-base_pkg_setup
 	python_set_active_version 2
 	python_pkg_setup
 }
 src_unpack() {
 	unpack libreoffice-build-${MY_PV}.tar.gz
 }
 src_prepare() {
 	# Hackish workaround for overlong path problem, see bug #130837
 	mv "${S_OLD}" "${S}" || die
 	#Some fixes for our patchset
 	cd "${S}"
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die
 	#Use flag checks
 	if use java ; then
 		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
 		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
 		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
 		echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
 		echo "--with-system-lucene" >> ${CONFFILE}
 		echo "--with-system-rhino" >> ${CONFFILE}
 		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
 		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
 		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
 		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 		# junit:4
 		use junit && echo "--with-junit=$(java-pkg_getjar junit-4 junit.jar)" >> ${CONFFILE}
 	fi
 	# junit:4
 	use !junit && echo "--without-junit" >> ${CONFFILE}
 	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
 	echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE}
 	echo $(use_enable binfilter) >> ${CONFFILE}
 	echo $(use_enable cups) >> ${CONFFILE}
 	echo $(use_enable dbus) >> ${CONFFILE}
 	echo $(use_enable eds evolution2) >> ${CONFFILE}
 	echo $(use_enable gnome gconf) >> ${CONFFILE}
 	echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
 	#gio support still gives crashes, see i#108993
 	echo "--disable-gio" >> ${CONFFILE}
 	echo $(use_enable gnome lockdown) >> ${CONFFILE}
 	echo $(use_enable gstreamer) >> ${CONFFILE}
 	echo $(use_enable gtk systray) >> ${CONFFILE}
 	echo $(use_enable ldap) >> ${CONFFILE}
 	echo $(use_enable opengl) >> ${CONFFILE}
 	echo $(use_with ldap openldap) >> ${CONFFILE}
 	echo $(use_enable debug crashdump) >> ${CONFFILE}
 	echo $(use_enable debug strip-solver) >> ${CONFFILE}
 	# Extension stuff
 	echo "--with-extension-integration" >> ${CONFFILE}
 	echo "--enable-minimizer" >> ${CONFFILE}
 	echo "--enable-pdfimport" >> ${CONFFILE}
 	echo "--enable-presenter-console" >> ${CONFFILE}
 	echo "--without-writer2latex" >> ${CONFFILE}
 	# Use splash screen without Sun logo
 	#echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.png\\\"" >> ${CONFFILE}
 	# Upstream this, disabled for now #i108911
 	#echo "--with-system-redland" >> ${CONFFILE}
 	# needed for sun-templates patch
 	eautoreconf
 }
 src_configure() {
 	use kde && export KDE4DIR="${KDEDIR}"
 	use kde && export QT4LIB="/usr/$(get_libdir)/qt4"
 	# Use multiprocessing by default now, it gets tested by upstream
 	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
 	# Compile problems with these ...
 	filter-flags "-funroll-loops"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
 	filter-flags "-ftracer"
 	filter-flags "-fforce-addr"
 	filter-flags "-O[s2-9]"
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		filter-flags "-fstack-protector"
 		filter-flags "-fstack-protector-all"
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 	# Build with NVidia cards breaks otherwise
 	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
 	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 	# Make sure gnome-users get gtk-support
 	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
 	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
 	cd "${S}"
 	./configure --with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
 		--with-num-cpus="${JOBS}" \
 		--without-binsuffix \
 		--with-installed-ooo-dirname="libreoffice" \
 		--with-tag="${MST}" \
 		--with-drink="True Blood" \
 		--without-git \
 		--without-split \
 		${GTKFLAG} \
 		--disable-mono \
 		--disable-kde \
 		$(use_enable kde kde4) \
 		$(use_enable !debug strip) \
 		$(use_enable odk) \
 		$(use_enable pam) \
 		$(use_with java) \
 		$(use_with templates sun-templates) \
 		--disable-access \
 		--disable-post-install-scripts \
 		--enable-extensions \
 		--with-split \
 		--with-system-libwpd \
 		--with-system-libwpg \
 		--mandir=/usr/share/man \
 		--libdir=/usr/$(get_libdir) \
 		|| die "Configuration failed!"
 }
 src_compile() {
 	make || die "Build failed"
 }
 src_install() {
 	export PYTHONPATH=""
 	einfo "Preparing Installation"
 	make DESTDIR="${D}" install || die "Installation failed!"
 	# Fix the permissions for security reasons
 	chown -RP root:0 "${D}"
 	# record java libraries
 	if use java; then
 			java-pkg_regjar "${D}"/usr/$(get_libdir)/libreoffice/${BASIS}/program/classes/*.jar
 			java-pkg_regjar "${D}"/usr/$(get_libdir)/libreoffice/ure/share/java/*.jar
 	fi
 	# Upstream places the bash-completion module in /etc. Gentoo places them in
 	# /usr/share/bash-completion. bug 226061
 	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
 	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
 }
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst
 	( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/libreoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/libreoffice/program/soffice.bin
 	# Add available & useful jars to libreoffice classpath
 	use java && /usr/$(get_libdir)/libreoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
 	elog " Some aditional functionality can be installed via Extension Manager: "
 	elog " *) PDF Import "
 	elog " *) Presentation Console "
 	elog " *) Presentation Minimizer "
 	elog
 	elog " Please use the packages provided in "
 	elog " /usr/$(get_libdir)/libreoffice/share/extension/install/ "
 	elog " instead of those from the SUN extension site. "
 	elog
 	kde4-base_pkg_postinst
 }
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@ -1,537 +0,0 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.97 2009/01/18 22:03:05 jsbronder Exp $
  07 Aug 2009; Mario Fetka <mario.fetka@gmail.com>
  firebird-2.1.2.18118.0.ebuild:
  correct some configure flags and do not delete the external packages
  07 Aug 2009; Mario Fetka <mario.fetka@gmail.com>
  firebird-2.1.2.18118.0.ebuild, +files/firebird-gcc-icu-declare-new.patch:
  Bump and add icu and gcc 4.4 patch
  18 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
  firebird-2.0.3.12981.0-r6.ebuild, firebird-2.0.3.12981.0-r7.ebuild,
  firebird-2.0.4.13130.1.ebuild, firebird-2.1.1.17910.0.ebuild:
  Add blocker against sys-cluster/ganglia as wltjr was retired.  #247213.
  08 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
  metadata.xml:
  Removing wltjr as a maintainer since he was retired.
 *firebird-2.1.1.17910.0 (23 Jul 2008)
 *firebird-2.0.4.13130.1 (23 Jul 2008)
  23 Jul 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.0.4.13130.1-deps-flags-libs.patch,
  -files/firebird-2.1.0.17798.0-deps-flags-libs.patch,
  +files/firebird-2.1.1.17910.0-deps-flags-libs.patch,
  +firebird-2.0.4.13130.1.ebuild, -firebird-2.1.0.17798.0-r1.ebuild,
  +firebird-2.1.1.17910.0.ebuild:
  Bumped to latest releases, removed past version. Lastest 2.1.x version
  seems to have resolved the infamous bug #197664
 *firebird-2.1.0.17798.0-r1 (06 Jun 2008)
 *firebird-2.0.3.12981.0-r7 (06 Jun 2008)
  06 Jun 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird.conf.d, +firebird-2.0.3.12981.0-r7.ebuild,
  -firebird-2.1.0.17798.0.ebuild, +firebird-2.1.0.17798.0-r1.ebuild:
  New conf.d file with updated root path to resolve bug #224715. Removed
  legacy env.d file.
 *firebird-2.1.0.17798.0 (19 Apr 2008)
  19 Apr 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch,
  +files/firebird-2.1.0.17798.0-deps-flags-libs.patch,
  -files/firebird.conf.d, -files/firebird.init.d.2,
  -firebird-2.0.3.12981.0-r5.ebuild, firebird-2.0.3.12981.0-r6.ebuild,
  -firebird-2.1.0.17755_rc2-r1.ebuild, +firebird-2.1.0.17798.0.ebuild:
  Bumped to latest release, removed past rc, and insecure version/files,
  removed dodoc on examples.
  14 Apr 2008; Markus Meier <maekke@gentoo.org>
  firebird-2.0.3.12981.0-r6.ebuild:
  amd64/x86 stable, security bug #216158
 *firebird-2.1.0.17755_rc2-r1 (10 Apr 2008)
 *firebird-2.0.3.12981.0-r6 (10 Apr 2008)
  10 Apr 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.0.3.12981.0-paths.patch, files/firebird.conf.d.2,
  +files/firebird.init.d, -firebird-2.0.3.12981.0-r2.ebuild,
  +firebird-2.0.3.12981.0-r6.ebuild, -firebird-2.1.0.17755_rc2.ebuild,
  +firebird-2.1.0.17755_rc2-r1.ebuild:
  Updated conf.d and init.d files. Removed legacy ISC cruft,
  username/password in text file, exported to env during start. Resolves bug
  #216158. Init script using s-s-d now for start and stop via pid. Added
  restart.
 *firebird-2.1.0.17755_rc2 (25 Mar 2008)
  25 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.1.0.17735_rc1-deps-flags-libs.patch,
  +files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch,
  -firebird-2.1.0.17735_rc1.ebuild, +firebird-2.1.0.17755_rc2.ebuild:
  Bumped to latest rc, removed previous rc. No progress on bug # 19766 :(,
  still hangs on create_db on some amd64 machines.
  25 Feb 2008; Steve Dibb <beandog@gentoo.org>
  firebird-2.0.3.12981.0-r5.ebuild:
  Fix multilib issues, amd64 stable, security bug 208034
  21 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
  firebird-2.0.3.12981.0-r5.ebuild:
  stable x86, security bug 208034
 *firebird-2.0.3.12981.0-r5 (18 Feb 2008)
  18 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.0.3.12981.0-CVE-2008-0387.patch,
  +files/firebird-2.0.3.12981.0-CVE-2008-0467.patch,
  -firebird-2.0.3.12981.0-r4.ebuild, +firebird-2.0.3.12981.0-r5.ebuild:
  Added patches to 2.0.3 per bug #208034 and CVE-2008-0387, CVE-2008-0467.
  Removed unstable version as this one replaces it.
 *firebird-2.1.0.17735_rc1 (13 Feb 2008)
  13 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch,
  +files/firebird-2.1.0.17735_rc1-deps-flags-libs.patch,
  -firebird-2.1.0.16780_beta2-r3.ebuild, +firebird-2.1.0.17735_rc1.ebuild:
  Bumped 2.1.x to rc1, removed beta version. No change wrt to bug #197664. 2.1
  fix for security bug #208034, have to patch 2.0, till 2.0.4 is released.
  16 Jan 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-2.0.3.12981.0-r2.ebuild, firebird-2.0.3.12981.0-r4.ebuild,
  firebird-2.1.0.16780_beta2-r3.ebuild:
  Added IDPL to LICENSE per bug #200276
 *firebird-2.1.0.16780_beta2-r3 (04 Jan 2008)
  04 Jan 2008; William L. Thomson Jr. <wltjr@gentoo.org>
  files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch,
  -firebird-2.1.0.16780_beta2-r2.ebuild,
  +firebird-2.1.0.16780_beta2-r3.ebuild:
  Updated patch to remove default hard coded cflags, accidentally removed that
  patch during a revision.
 *firebird-2.1.0.16780_beta2-r2 (04 Dec 2007)
 *firebird-2.0.3.12981.0-r4 (04 Dec 2007)
  04 Dec 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch,
  -files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch,
  +files/firebird.conf.d, -firebird-2.0.3.12981.0-r3.ebuild,
  +firebird-2.0.3.12981.0-r4.ebuild, -firebird-2.1.0.16780_beta2-r1.ebuild,
  +firebird-2.1.0.16780_beta2-r2.ebuild:
  Switched from patches to sed for path changes w/ sed checks via function.
  Moved core from /usr/share/firebird -> /usr/lib/firebird since it contains
  arch specific binaries, per FHS. Renamed isql -> fbsql per bug #198388.
  Fixed missing path tweak for bug #198540. Removed past versions, should be
  all folks :)
  12 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird.conf.d, -files/firebird.init.d, -files/firebird.xinetd,
  -firebird-2.0.3.12981.0.ebuild:
  Removed past non-split version that installed all under /opt/firebird
  09 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-2.0.3.12981.0-r2.ebuild, firebird-2.0.3.12981.0-r3.ebuild,
  firebird-2.1.0.16780_beta2-r1.ebuild:
  Fixed installed of xinetd file, from using generic one in -> gentoo specific
  in , bug #198538
  06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-2.0.3.12981.0-r2.ebuild:
  amd64 stable, bug #198213.
  06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-2.0.3.12981.0-r2.ebuild, firebird-2.0.3.12981.0-r3.ebuild,
  firebird-2.1.0.16780_beta2-r1.ebuild:
  Reverted back to newexe vs doexe so libfbintl.so -> fbintl.so as fb expects
  it. No rev bump. x86 was just stabilized recently, amd64 will be shortly,
  other ebuilds just added. Thus no rev bump due to all that in brief window
 *firebird-2.1.0.16780_beta2-r1 (06 Nov 2007)
 *firebird-2.0.3.12981.0-r3 (06 Nov 2007)
  06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.0.3.12981.0-flags.patch,
  +files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch,
  -files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch,
  +firebird-2.0.3.12981.0-r3.ebuild, -firebird-2.1.0.16780_beta2.ebuild,
  +firebird-2.1.0.16780_beta2-r1.ebuild:
  Added patch for custom flags vs default hard coded, thanks to cla there :).
  Removed past 2.1 beta version.
  06 Nov 2007; Dawid Węgliński <cla@gentoo.org>
  firebird-2.0.3.12981.0-r2.ebuild:
  Stable on x86 (bug #198213)
 *firebird-2.1.0.16780_beta2 (19 Oct 2007)
  19 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch,
  -firebird-1.5.4-r3.ebuild, +firebird-2.1.0.16780_beta2.ebuild:
  Bumped to latest beta, remade and unified patches to patch. Removed old
  version.
  01 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -firebird-2.0.3.12981.0-r1.ebuild, firebird-2.0.3.12981.0-r2.ebuild:
  Ebuild QA, quoted , added , etc. No changes that effect installed files or
  etc, so no rev bump. Removed past revision
 *firebird-2.0.3.12981.0-r2 (01 Oct 2007)
  01 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +firebird-2.0.3.12981.0-r2.ebuild:
  Corrected missing fbintl.conf, other minor changes, removed previous revision
 *firebird-2.0.3.12981.0-r1 (21 Sep 2007)
  21 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.0.1.12855.0-external-libs.patch,
  -files/firebird-2.0.1.12855.0-make-deps.patch,
  +files/firebird-2.0.3.12981.0-paths.patch, +files/firebird.conf.d.2,
  +files/firebird.init.d.2, +files/firebird.xinetd.2, metadata.xml,
  -firebird-2.0.1.12855.0-r4.ebuild, -firebird-2.0.1.12855.0-r5.ebuild,
  +firebird-2.0.3.12981.0-r1.ebuild:
  Major changes, Firebird is no longer installed in opt :). Added paths patch.
  Took over as sole maintainer since I am doing all the work anyway ;)
  16 Sep 2007; Christoph Mende <angelos@gentoo.org>
  firebird-2.0.3.12981.0.ebuild:
  Stable on amd64 wrt security bug #190833
  15 Sep 2007; Markus Meier <maekke@gentoo.org>
  firebird-2.0.3.12981.0.ebuild:
  stable on x86, wrt security bug #190833
 *firebird-2.0.3.12981.0 (13 Sep 2007)
  13 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-2.0.2.12964.0-external-libs.patch,
  -files/firebird-2.0.2.12964.0-make-deps.patch,
  +files/firebird-2.0.3.12981.0-external-libs.patch,
  +files/firebird-2.0.3.12981.0-make-deps.patch,
  -firebird-2.0.2.12964.0.ebuild, +firebird-2.0.3.12981.0.ebuild:
  Bumped to latest pre-release. Removed past 2.0.2.x due to that version being
  withdrawn by upstream.
  09 Sep 2007; Markus Meier <maekke@gentoo.org>
  firebird-2.0.2.12964.0.ebuild:
  stable on x86, wrt security bug #190833
 *firebird-2.0.2.12964.0 (31 Aug 2007)
  31 Aug 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +files/firebird-2.0.2.12964.0-external-libs.patch,
  +files/firebird-2.0.2.12964.0-make-deps.patch,
  +firebird-2.0.2.12964.0.ebuild:
  Bumped to latest release. Addresses security bug #190833, but will still
  need to be tested and likely rush stabilized.
  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
  firebird-1.5.4-r3.ebuild:
  (QA) RESTRICT clean up.
 *firebird-2.0.1.12855.0-r5 (01 Jul 2007)
  01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/firebird-1.5.0.xinetd, files/firebird.xinetd,
  -firebird-1.5.4-r2.ebuild, firebird-1.5.4-r3.ebuild,
  +firebird-2.0.1.12855.0-r5.ebuild:
  Old version and files cleanup. Installing upgrade sql script, and misc files
  now. Preparation for automated security.fdb -> security2.fdb via pkg_config
  25 Jun 2007; Christoph Mende <angelos@gentoo.org>
  firebird-2.0.1.12855.0-r4.ebuild:
  Stable on amd64 wrt security bug 181811
  24 Jun 2007; Raúl Porcel <armin76@gentoo.org>
  firebird-2.0.1.12855.0-r4.ebuild:
  x86 stable wrt security #181811
  21 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-1.5.4-r2.ebuild, firebird-1.5.4-r3.ebuild:
  Dropped sparc keyword down to -sparc per bug #181811
 *firebird-2.0.1.12855.0-r4 (14 Jun 2007)
  14 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -firebird-2.0.1.12855.0-r3.ebuild, +firebird-2.0.1.12855.0-r4.ebuild:
  Fix for character sets like ISO8859_1 and others. Thanks to Gianni Rossi
  <nasus.maximos@gmail.com>. Also removed log file creation and etc from
  pkg_config. It's in src_install now.
 *firebird-1.5.4-r3 (16 May 2007)
  16 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  +firebird-1.5.4-r3.ebuild:
  Fixed issue *.so being installed into /opt/firebird/lib instead of
  /opt/firebird/lib64 on stable 64bit archs. Where ~arch creates and installs
  to /opt/firebird/lib64 ?
  15 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -files/70firebird-1.5.0, -files/firebird-1.5.1-gcc34.patch,
  -files/firebird-1.5.3-gcc412.patch, -files/firebird-1.5-build.patch,
  -firebird-1.5.3-r1.ebuild, -firebird-1.5.4.ebuild:
  House cleaning removed older versions and unused patches
  15 May 2007; Ferris McCormick <fmccor@gentoo.org>
  firebird-1.5.4-r2.ebuild:
  Stable on sparc --- Security Bug #120343 (Comment 34) --- now that Bug
  #177916 is resolved.
  15 May 2007; Christian Faulhammer <opfer@gentoo.org>
  firebird-1.5.4-r2.ebuild:
  stable x86/amd64, security bug 120343
  14 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  firebird-1.5.4-r2.ebuild:
  Dropped calls to rm symlinks from the live system, which should be the cause
  for bug #177916.
 *firebird-2.0.1.12855.0-r3 (14 May 2007)
  14 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
  -firebird-2.0.1.12855.0-r2.ebuild, +firebird-2.0.1.12855.0-r3.ebuild:
  Corrected user/group tomcat -> firebird. Habit of typing tomcat, oops :)
 *firebird-2.0.1.12855.0-r1 (12 May 2007)
 *firebird-1.5.4-r1 (12 May 2007)
  12 May 2007; William L. Thomson Jr. <wltjr@gentoo.org> metadata.xml,
  +firebird-1.5.4-r1.ebuild, -firebird-2.0.1.12855.0.ebuild,
  +firebird-2.0.1.12855.0-r1.ebuild:
  Resolved bug #159701 in 1.5.4-r1. Many updates to 2.0.1, should be ready to
  be umasked for further testing. Dropped ~sparc from 2.0.1, dep issues with
  libedit. Updated metadata, added myself as co-maintainer.
  11 May 2007; Raúl Porcel <armin76@gentoo.org> firebird-1.5.4.ebuild:
  x86 stable wrt security bug 120343
 *firebird-2.0.1.12855.0 (11 May 2007)
  11 May 2007; Timothy Redaelli <drizzt@gentoo.org>
  +files/firebird-2.0.1.12855.0-external-libs.patch,
  +files/firebird-2.0.1.12855.0-make-deps.patch, metadata.xml,
  +firebird-2.0.1.12855.0.ebuild:
  Add firebird 2.0.1.
  Thanks for Diego Pettenò and William L. Thomson Jr. wrt bug #117869.
 *firebird-1.5.4 (09 May 2007)
  09 May 2007; Carsten Lohrke <carlo@gentoo.org> -firebird-1.5.1.ebuild,
  -firebird-1.5.2.ebuild, -firebird-1.5.3.ebuild, +firebird-1.5.4.ebuild:
  Clean up. Version bump.
  07 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
  +files/firebird-1.5.3-gcc412.patch, firebird-1.5.3-r1.ebuild:
  Add patch from Debian to fix C/C++ linkage declaration collisions, bug
  #167051.
  02 Feb 2007; Simon Stelling <blubb@gentoo.org> firebird-1.5.3-r1.ebuild:
  bumping back to ~amd64 because of known problems according to upstream; bug
  156885
  31 Jan 2007; Marius Mauch <genone@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, firebird-1.5.3-r1.ebuild:
  Replacing einfo with elog
  23 Nov 2006; <blubb@gentoo.org> firebird-1.5.3-r1.ebuild:
  stable on amd64
  13 Sep 2006; Joshua Jackson <tsunam@gentoo.org> firebird-1.5.3-r1.ebuild:
  Stable x86; bug #144224
  25 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org>
  firebird-1.5.3-r1.ebuild:
  Stable on sparc wrt #144224
  07 Aug 2006; Karol Wojtaszek <sekretarz@gentoo.org>
  firebird-1.5.3-r1.ebuild:
  Fixed compilation problem with gcc-4, bug #120867
  23 Mar 2006; Aron Griffis <agriffis@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, firebird-1.5.3-r1.ebuild:
  No versions of firebird presently build on ia64. 1.5.1 attempts to build
  with x86-only CFLAGS and 1.5.3 doesn't have IMPLEMENTATION #defined for
  ia64. Mark them all -ia64 (with use-masking to following)
  19 Mar 2006; Mark Loeser <halcy0n@gentoo.org> firebird-1.5.3-r1.ebuild:
  Add DEPEND on app-arch/unzip
 *firebird-1.5.3-r1 (11 Feb 2006)
  11 Feb 2006; Karol Wojtaszek <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, +firebird-1.5.3-r1.ebuild:
  Changed inetd USE flag to xinetd, bug #121886. Added doc USE flag handling
  useful docs from firebird website
  31 Jan 2006; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild, firebird-1.5.3.ebuild:
  Configure ${PF} in postinst.
  31 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> firebird-1.5.3.ebuild:
  Stable on sparc wrt security #120343
  31 Jan 2006; Mark Loeser <halcy0n@gentoo.org> firebird-1.5.3.ebuild:
  Stable on x86; bug #120343
  31 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> firebird-1.5.3.ebuild:
  ${PV} -> ${P} in postinst
 *firebird-1.5.3 (29 Jan 2006)
  29 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
  -files/firebird-1.5.2-build.patch, +files/firebird-1.5-build.patch,
  firebird-1.5.2.ebuild, +firebird-1.5.3.ebuild:
  Version bump, release fixes security problems, bug #120343
  24 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
  +files/firebird-1.5.2-build.patch, firebird-1.5.2.ebuild:
  Firebird now uses user CFLAGS instead its own, bug #108275, thanks to vapier
  30 Dec 2005; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild:
  User config changes according to #109482.
  25 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> firebird-1.5.1.ebuild:
  Stable on sparc
  24 Aug 2005; <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild:
  Changed chown root:root to root:0 to be compliant with BSD and Darwin, bug
  #103563
  31 Jul 2005; <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild:
  Firebird provide now symlink libfbclient.so to libgds.so in
  /opt/firebird/lib directory for back compablity, bug #96636. Fixed harmless
  sed errors, bug #99079
  14 Jun 2005; <sekretarz@gentoo.org> files/70firebird,
  firebird-1.5.1.ebuild, firebird-1.5.2.ebuild:
  Fixed path in ebuild to install /etc/env.d/70firebird correctly, bug #95731
  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
  firebird-1.5.2.ebuild:
  corrected description, ansi sql 92 -> 99
 *firebird-1.5.2 (06 Jan 2005)
  06 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
  +firebird-1.5.2.ebuild:
  Version bump
  08 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
  firebird-1.5.1.ebuild:
  Fixed obsolete chown syntax, bug #69597
  17 Oct 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
  firebird-1.5.1.ebuild:
  Keyworded ~amd64
  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
  files/firebird-1.5.1-gcc34.patch:
  Fixing patch for gcc-3.4, now it works with gcc-3.3 :)
  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
  -files/firebird-1.0-gentoo.patch, -files/firebird-1.0.3-gentoo.patch,
  -firebird-1.0-r1.ebuild, -firebird-1.0.3.ebuild, -firebird-1.5.0.ebuild:
  ebuild clean up
  13 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
  +files/firebird-1.5.1-gcc34.patch, firebird-1.5.1.ebuild:
  Fixed gcc-34 compilation issues. Bug #59154, thanks to Canal Vorfeed
  <canalvorfeed@mail.ru>
  08 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> firebird-1.5.1.ebuild:
  Keyworded ~sparc wrt #63184
  01 Aug 2004; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild:
  small xinetd fix
 *firebird-1.5.1 (01 Aug 2004)
  01 Aug 2004; Carsten Lohrke <carlo@gentoo.org> +firebird-1.5.1.ebuild:
  version bump
  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> firebird-1.0-r1.ebuild,
  firebird-1.0.3.ebuild, firebird-1.5.0.ebuild:
  sync IUSE (missing), glibc -> libc
  14 May 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
  Marked 1.5.0 as stable on x86
  26 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
  Modified the license to Interbase-1.0
  25 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
  move and symlink firebird.log to /var/log
  change the check the for localhost in /etc/hosts.equiv to make sure it
  won't catch localhost.localdomain as well
  unmask for x86
  04 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
  Modified classic local USE flag, changed to inetd
  Added a warning to disable older xinetd server (if SuperServer is used)
  31 Mar 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild, files/firebird.conf.d,
  files/firebird.init.d:
  Default build method changed to SuperServer Added local USE flag - classic, to
  build the inetd version Modified config() to add localhost to /etc/hosts.equiv
  instead of localhost.localdomain
 *firebird-1.5.0 (26 Feb 2004)
  26 Feb 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
  New upstream version
  26 Feb 2004; <mksoft@gentoo.org> firebird-1.0.3,firebird-1.0-r1:
  Fixed Copyright years
 *firebird-1.0.3 (15 Jun 2003)
  08 Dec 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  Added strip-flags -funroll-loops. Closes bug #33584
  29 Oct 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  Modified firebird-1.0.3-gentoo.patch; Closes bug #28685
  30 Aug 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  Added RESTRICT="nouserpriv", bug #24455
  Added metadata.xml
  Marked ebuild as stable
  22 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  added a check for isc4.gdb for prev 1.0-r1 install. If exists and not
  a symlink copy to /etc/firebird/isc4.gdb
  15 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  Added firebird to /etc/xinetd.d, 70firebird to /etc/env.d
  Kill lingering gds_lock_mgr processes. Closes #15071
  11 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
  New upstream version, 1.0.3. Closes #16237
 *firebird-1.0-r1 (22 Mar 2002)
  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> firebird-1.0-r1.ebuild:
  Changed description. Closes #19376.
  22 Mar 2002; G.Bevin <gbevin@gentoo.org> firebird-1.0-r1.ebuild
  files/firebird-1.0-r1 files/firebird-1.0-gentoo.patch:
  Fixes for compilation with gcc3 and setting of make.conf CFLAGS.
 *firebird-1.0 (20 Mar 2002)
  20 Mar 2002; G.Bevin <gbevin@gentoo.org> firebird-1.0.ebuild
  files/firebird-1.0:
  Initial package for the firebird database.
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@ -1,12 +0,0 @@
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.1.2.18118.0-deps-flags-libs.patch 4509 RMD160 0f391b8bb34e18af79949b0880c71607ee4b0259 SHA1 b1bda417c38f7d2574c2fef119ae84ba4cc58c83 SHA256 1b56b6aa8e10c1126fe1c4218fc1f079dd3708551926e6fb4be7b43f44b5a003
 AUX firebird-gcc-icu-declare-new.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
 AUX firebird.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9ef1b7c1186feecdf7574cacca6b589c8029f SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
 AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 DIST Firebird-2.1.2.18118-0.tar.bz2 13485341 RMD160 37a35600092758715b4d1f82d728fa2e87f8c2de SHA1 1f2528af1804eb09f06f8cfa1d97b9643af181ef SHA256 91cb30a744c6d1e05a259ca97acc1f24d20e478ac37b7130e0675f209b3ec6e3
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.1.2.18118.0.ebuild 10153 RMD160 a60b0895aa0c971f7fd567f857db36aa6df0756b SHA1 6f585713105140351015a8646134ea194cb020e0 SHA256 5a099c7b42b71d3dfe497c903625ab71267430d5f2be1a04b80655797b473b9f
 MISC ChangeLog 21530 RMD160 6b9195595773d3a7e2c07ec07e3a8385865a36ea SHA1 5114d632040749d608ef99c94fb3d6bc8b40bb63 SHA256 5c966a4e80043d20f79adc7e7ce47bfba24328e049175e9f00b25781cd5e743c
 MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8
--- a/dev-db/firebird/files/70firebird
+++ b/dev-db/firebird/files/70firebird
@ -1,2 +0,0 @@
 PATH=/opt/firebird/bin
 ROOTPATH=/opt/firebird/bin
--- a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
@ -1,107 +0,0 @@
 diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird
 --- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird	2008-12-10 17:22:15.000000000 +0200
 +++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird	2009-05-20 15:13:47.673202327 +0300
@@ -185,14 +185,7 @@
 # 
 external_libraries:
 -ifeq ($(STD_ICU),false)
 -	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
 -endif
 -ifeq ($(STD_EDITLINE),false)
 -ifeq ($(EDITLINE_FLG),Y)
 -	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
 -endif
 -endif
 +
 btyacc_binary: $(BTYACC)
 diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults
 --- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults	2008-09-04 14:47:18.000000000 +0300
 +++ Firebird-2.1.2.18118-0/builds/posix/make.defaults	2009-05-20 15:15:31.088202976 +0300
@@ -232,11 +232,7 @@
 LIBFBSTATIC_A = $(LIB)/libfbstatic.a
 ifeq ($(EDITLINE_FLG),Y)
 -  ifeq ($(STD_EDITLINE), true)
 -	LIBEDITLINE := -leditline
 -  else
 -	LIBEDITLINE := $(LIB)/libeditline.a
 -  endif
 +  LIBEDITLINE := -ledit
 endif
 LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
 diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules
 --- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules	2008-12-10 03:03:31.000000000 +0200
 +++ Firebird-2.1.2.18118-0/builds/posix/make.rules	2009-05-20 15:21:04.114225351 +0300
@@ -33,9 +33,6 @@
 # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
 CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
 -ifeq ($(STD_ICU),false)
 -  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
 -endif
 ifeq ($(IsProdTypeBuild),Y)
   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
@@ -69,7 +66,7 @@
 .SUFFIXES: .c .e .epp .cpp
 -.e.c:
 +.e.c: $(GPRE_CURRENT):
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets
 --- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets	2008-12-10 03:03:31.000000000 +0200
 +++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets	2009-05-20 15:21:59.299203496 +0300
@@ -49,7 +49,7 @@
 # gpre_meta needs a special boot build since there is no database.
 -$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
 +$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
 diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux
 --- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux	2007-05-03 14:24:50.000000000 +0300
 +++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux	2009-05-20 15:23:17.286523276 +0300
@@ -20,12 +20,10 @@
 # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
 # you may remove it if engine is getting compiled with any other GCC version
 -
 -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
 -OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
 +COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 -PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
 +PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
 DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
 #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
 diff -Naur Firebird-2.1.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure
 --- Firebird-2.1.2.18118-0_orig/configure	2009-03-30 09:42:44.000000000 +0300
 +++ Firebird-2.1.2.18118-0/configure	2009-05-20 15:26:30.856202564 +0300
@@ -4027,13 +4027,13 @@
 # not need editline in default libs, but need to test for its presence
 saveLIBS=$LIBS
 if test "$STD_EDITLINE" = "true"; then
 -  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
 -echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
 +echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
 if test "${ac_cv_lib_editline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-leditline  $LIBS"
 +LIBS="-ledit  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
--- a/dev-db/firebird/files/firebird-gcc-icu-declare-new.patch
+++ b/dev-db/firebird/files/firebird-gcc-icu-declare-new.patch
@ -1,27 +0,0 @@
 --- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
 +++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
@@ -48,6 +48,8 @@
 					   stdlib.h (EKU) */
 #endif
 +#include <new>
 +
 #ifdef _MSC_VER
 #define THROW_BAD_ALLOC
 #else
@@ -448,15 +450,6 @@
 	);
 }
 -inline void* operator new(size_t, void* ptr) throw() 
 -{
 -	return ptr;
 -}
 -inline void* operator new[](size_t, void* ptr) throw() 
 -{
 -	return ptr;
 -}
 -
 inline void operator delete(void* mem) throw()
 {
 	Firebird::MemoryPool::globalFree(mem);
--- a/dev-db/firebird/files/firebird.conf.d
+++ b/dev-db/firebird/files/firebird.conf.d
@ -1,3 +0,0 @@
 FBRunUser=firebird
 FIREBIRD=/usr/lib/firebird
 MANAGER=/usr/bin/fbmgr.bin
--- a/dev-db/firebird/files/firebird.conf.d.2
+++ b/dev-db/firebird/files/firebird.conf.d.2
@ -1,4 +0,0 @@
 FIREBIRD=/usr/share/firebird
 FBRunUser=firebird
 MANAGER=/usr/bin/fbmgr.bin
 LD_LIBRARY_PATH=$FIREBIRD/lib
--- a/dev-db/firebird/files/firebird.init.d
+++ b/dev-db/firebird/files/firebird.init.d
@ -1,32 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.4 2008/04/10 23:00:00 wltjr Exp $
 pidfile=/var/run/firebird/firebird.pid
 FB_OPTS="-pidfile $pidfile -start -forever"
 export FIREBIRD LD_LIBRARY_PATH
 depend() {
 	need net
 }
 start(){
 	ebegin "Starting Firebird server"
 	start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $MANAGER -- $FB_OPTS
 	eend $?
 }
 stop(){
 	ebegin "Stopping Firebird server"
 	start-stop-daemon --stop --pidfile $pidfile --oknodo
 	eend $?
 }
 restart(){
 	svc_stop
 	sleep 1
 	svc_start
 }
--- a/dev-db/firebird/files/firebird.xinetd.2
+++ b/dev-db/firebird/files/firebird.xinetd.2
@ -1,11 +0,0 @@
 service gds_db
 {
 	flags			= REUSE
 	socket_type		= stream
 	wait			= no
 	user			= firebird
 	log_on_success		+= USERID
 	log_on_failure 		+= USERID
 	server			= /usr/bin/fb_inet_server
 	disable			= yes
 }
--- a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
@ -1,275 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.2 2009/01/18 22:03:05 jsbronder Exp $
 inherit flag-o-matic eutils autotools versionator
 MY_P=Firebird-$(replace_version_separator 4 -)
 #MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
 DESCRIPTION="A relational database offering many ANSI SQL-99 features"
 HOMEPAGE="http://firebird.sourceforge.net/"
 SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
 	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 -ia64 ~x86"
 IUSE="doc xinetd examples debug"
 RESTRICT="userpriv"
 RDEPEND="dev-libs/libedit
 	dev-libs/icu"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 RDEPEND="${RDEPEND}
 	xinetd? ( virtual/inetd )
 	!sys-cluster/ganglia"
 S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	enewgroup firebird 450
 	enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
 }
 function check_sed() {
 	MSG="sed of $3, required $2 lines modified $1"
 	einfo "${MSG}"
 	[[ $1 -ge $2 ]] || die "${MSG}"
 }
 src_unpack() {
 	if use doc; then
 		# Unpack docs
 		mkdir "${WORKDIR}/manuals"
 		cd "${WORKDIR}/manuals"
 		unpack ib_b60_doc.zip
 		cd "${WORKDIR}"
 	fi
 	unpack "${MY_P}.tar.bz2"
 	# compile time relative path hacks, ew :(
 	mkdir -p "${WORKDIR}/../etc" \
 		"${WORKDIR}/usr" \
 		"${WORKDIR}/var/log/firebird" \
 		"${WORKDIR}/var/run/firebird"
 	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
 	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
 	epatch "${FILESDIR}/${PN}-gcc-icu-declare-new.patch"
 	einfo "Split up Firebird via relative path hacks"
 	# sed vs patch for portability and addtional location changes
 	# based on FIREBIRD=/usr/lib/firebird
 	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
 		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
 	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
 		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
 		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
 		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
 		-e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
 		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
 		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
 		src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
 	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
 		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
 	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
 		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
 	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
 		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
 		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
 		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
 		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
 		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
 		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
 		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
 		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
 		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
 	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
 		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
 	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
 		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
 	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
 		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
 	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
 		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
 	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
 		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
 	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
 		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
 	# Rename references to isql to fbsql
 	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
 		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
 	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
 		src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
 	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
 		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
 	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
 	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
 		-e 's:isql :fbsql :w /dev/stdout' \
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
 	# rm -rf "${S}"/extern/{editline,icu}
 	eautoreconf
 }
 src_compile() {
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
 	econf --prefix=/usr/lib/firebird --with-system-editline --with-system-icu \
 		$(use_enable !xinetd superserver) \
 		$(use_enable debug) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "error during make"
 }
 src_install() {
 	cd "${S}/gen/firebird"
 # Seems to be ignored?
 	insinto /usr/share/firebird/bin
 	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
 	rm bin/*.sh || die "Could not remove *sh files"
 	einfo "Renaming isql -> fbsql"
 	mv bin/isql bin/fbsql
 	insinto /usr/bin
 	dobin bin/*
 	insinto /usr/include
 	doins include/*
 	insinto /usr/lib
 	dolib.so lib/*.so*
 	dolib.a lib/*.a*
 	insinto /usr/lib/firebird
 	doins *.msg
 	insinto /usr/lib/firebird/help
 	doins help/help.fdb
 	insinto /usr/share/firebird/upgrade
 	doins "${S}"/src/misc/upgrade/v2/*
 	insinto /etc/firebird
 	insopts -m0644 -o firebird -g firebird
 	doins misc/*
 	doins ../install/misc/aliases.conf
 	insopts -m0660 -o firebird -g firebird
 	doins security2.fdb
 	exeinto /usr/lib/firebird/UDF
 	doexe UDF/*.so
 	exeinto /usr/lib/firebird/intl
 	newexe intl/libfbintl.so fbintl.so
 	insinto /usr/lib/firebird/intl
 	doins ../install/misc/fbintl.conf
 	diropts -m 755 -o firebird -g firebird
 	dodir /var/log/firebird
 	dodir /var/run/firebird
 	keepdir /var/log/firebird
 	keepdir /var/run/firebird
 	# create links for backwards compatibility
 	cd "${D}/usr/lib"
 	ln -s libfbclient.so libgds.so
 	ln -s libfbclient.so libgds.so.0
 	ln -s libfbclient.so libfbclient.so.1
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
 	else
 		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
 		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
 		fperms 640 /etc/conf.d/${PN}
 	fi
 	# Install docs
 	use doc && dodoc "${WORKDIR}"/manuals/*
 	use examples && docinto examples
 }
 pkg_postinst() {
 	# Hack to fix ownership/perms
 	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
 	chmod 750 "${ROOT}/etc/firebird"
 	elog
 	elog "Firebird is no longer installed in /opt. Binaries are in"
 	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
 	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
 	elog "The command line tool isql has been renamed to fbsql."
 	elog "Please report any problems or issues to bugs.gentoo.org."
 	elog
 }
 pkg_config() {
 	# if found /etc/security.gdb from previous install, backup, and restore as
 	# /etc/security2.fdb
 	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
 		# if we have scurity2.fdb already, back it 1st
 		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
 			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
 		fi
 		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
 		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
 		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
 		rm "${ROOT}/etc/firebird/security.gbk"
 		# make sure they are readable only to firebird
 		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
 		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
 		einfo
 		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
 		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
 		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
 		einfo
 	fi
 	# we need to enable local access to the server
 	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
 		touch "${ROOT}/etc/hosts.equiv"
 		chown root:0 "${ROOT}/etc/hosts.equiv"
 		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
 	fi
 	# add 'localhost.localdomain' to the hosts.equiv file...
 	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
 		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
 		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
 	fi
 	# add 'localhost' to the hosts.equiv file...
 	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
 		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
 		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
 	fi
 	HS_NAME=`hostname`
 	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
 		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
 		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
 	fi
 	einfo "If you're using UDFs, please remember to move them"
 	einfo "to /usr/lib/firebird/UDF"
 }
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.
 	Firebird offers excellent concurrency, high performance, and powerful
 	language support for stored procedures and triggers. It has been used
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
 </pkgmetadata>
--- a/dev-java/ICEpdf/Manifest
+++ b/dev-java/ICEpdf/Manifest
@ -1,2 +1,2 @@
-DIST ICEpdf-4.1.0-src.zip 2387613 RMD160 7b233209f121eded71a1e0175659e13f6abef17e SHA1 09931f71c60d5950fc8dfadc5c8c1f0aa8554788 SHA256 b03bd7cd4bde411e74b6bc54f6984bac9a15d6429ef88c9c86c53206eea5d4e3
+DIST ICEpdf-4.1.1-src.zip 2403094 RMD160 b3c86d7d96caa10158634e5ec64b4a30c9777354 SHA1 dd9128358d41611a3398358667b260039700eef8 SHA256 73ab7a02b2ec7b68812b4c5c6f62241394f022570e8d984b7993d8cea053d562
-EBUILD ICEpdf-4.1.0.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f
+EBUILD ICEpdf-4.1.1.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@ -1,152 +0,0 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.39 2010/01/23 02:52:23 matsuu Exp $
 *fribidi-0.19.2 (23 Jan 2010)
  23 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> -fribidi-0.10.4.ebuild,
  +fribidi-0.19.2.ebuild:
  Version bumped, bug #301107. Removed old version.
  14 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
  fribidi-0.19.1.ebuild:
  Transfer Prefix keywords
  12 Oct 2009; Raúl Porcel <armin76@gentoo.org> fribidi-0.10.4.ebuild,
  fribidi-0.10.7.ebuild:
  sh stable
  23 Sep 2009; Patrick Lauer <patrick@gentoo.org> fribidi-0.10.4.ebuild:
  Remove virtual/libc
  05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> fribidi-0.10.4.ebuild,
  fribidi-0.10.7.ebuild, fribidi-0.10.9.ebuild, fribidi-0.19.1.ebuild:
  Fix keyword mixup.
  05 Apr 2009; Raúl Porcel <armin76@gentoo.org> fribidi-0.10.4.ebuild,
  fribidi-0.10.7.ebuild, fribidi-0.10.9.ebuild, fribidi-0.19.1.ebuild:
  Add ~sh
 *fribidi-0.19.1 (01 Jan 2009)
  01 Jan 2009; MATSUU Takuto <matsuu@gentoo.org>
  -files/fribidi-0.10.5-darwin.patch, -fribidi-0.10.5.ebuild,
  +fribidi-0.19.1.ebuild:
  Version bumped. Removed old version.
 *fribidi-0.10.9 (11 Dec 2007)
  11 Dec 2007; MATSUU Takuto <matsuu@gentoo.org> +fribidi-0.10.9.ebuild:
  Version bumbed, bug 201969.
  08 May 2007; Fabian Groffen <grobian@gentoo.org> fribidi-0.10.4.ebuild,
  fribidi-0.10.5.ebuild, fribidi-0.10.7.ebuild:
  Dropped ppc-macos keyword, see you in prefix
  20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> fribidi-0.10.7.ebuild:
  Stable on Alpha.
  15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> fribidi-0.10.7.ebuild:
  Stable on ia64.
  06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> fribidi-0.10.7.ebuild:
  Stable on x86 wrt bug #131795.
  01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
  fribidi-0.10.7.ebuild:
  hppa stable, bug #131795
  01 Oct 2006; Jason Wever <weeve@gentoo.org> fribidi-0.10.7.ebuild:
  Stable on SPARC wrt bug #131795.
  28 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
  fribidi-0.10.7.ebuild:
  stable on ppc (Bug #131795)
  22 Sep 2006; <blubb@gentoo.org> fribidi-0.10.7.ebuild:
  stable on amd64
  22 Sep 2006; Fabian Groffen <grobian@gentoo.org> fribidi-0.10.7.ebuild:
  Marked ppc-macos stable (bug #131795)
  22 Sep 2006; Markus Rothe <corsair@gentoo.org> fribidi-0.10.7.ebuild:
  Stable on ppc64; bug #131795
  09 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> fribidi-0.10.7.ebuild:
  Add ~x86-fbsd keyword.
 *fribidi-0.10.7 (11 Feb 2006)
  11 Feb 2006; MATSUU Takuto <matsuu@gentoo.org> +fribidi-0.10.7.ebuild:
  Version bumped.
  Removed darwin patch because it works on my ppc-macos without patch.
  09 Oct 2005; Fabian Groffen <grobian@gentoo.org>
  +files/fribidi-0.10.5-darwin.patch, fribidi-0.10.4.ebuild,
  fribidi-0.10.5.ebuild:
  - Removing conditional patching for ppc-macos
  - Fixing patch for 0.10.5
  - Fixing libtool/compilation for 0.10.5 on OSX
  - Removing ANNOUNCE from doc on 0.10.5 as dodoc complains it cannot find it
 *fribidi-0.10.5 (22 Sep 2005)
  22 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> +fribidi-0.10.5.ebuild:
  Version bumped. Bug 104349.
  08 Jul 2005; Hardave Riar <hardave@gentoo.org> fribidi-0.10.4.ebuild:
  Stable on mips.
  24 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> fribidi-0.10.4.ebuild:
  Stable ppc-macos
  12 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> fribidi-0.10.4.ebuild:
  Unstable ppc-macos
  18 Aug 2004; Hardave Riar <hardave@gentoo.org> fribidi-0.10.4.ebuild:
  Added ~mips keyword
  16 Jul 2004; Tom Gall <tgall@gentoo.org> fribidi-0.10.4.ebuild:
  stable on ppc64
  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
  fribidi-0.10.4.ebuild:
  virtual/glibc -> virtual/libc
  16 Feb 2004; Aron Griffis <agriffis@gentoo.org> fribidi-0.10.4.ebuild:
  stable on alpha and ia64
  07 Jan 2004; <gustavoz@gentoo.org> fribidi-0.10.4.ebuild:
  marked stable on hppa
  16 Nov 2003; Brad House <brad_mssw@gentoo.org> fribidi-0.10.4.ebuild:
  mark stable on amd64
  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> fribidi-0.10.4.ebuild:
  bug #30272
  21 Sep 2003; Todd Sunderlin <todd@gentoo.org> fribidi-0.10.4.ebuild:
  marked stable on sparc
  30 Aug 2003; Jason Wever <weeve@gentoo.org> fribidi-0.10.4.ebuild:
  Added ~sparc to keywords.
 *fribidi-0.10.4 (01 Apr 2003)
  05 Jul 2003; Masatomo Nakano <nakano@gentoo.org> fribidi-0.10.4.ebuild:
  Marked as stable(x86,ppc)
  04 Jun 2003; Luca Barbato <lu_zero@gentoo.org> fribidi-0.10.4.ebuild :
  Added ~ppc keyword
  08 Apr 2003; Dan Armak <danarmak@gentoo.org> fribidi-0.10.4.ebuild:
  At the same time I added this ebuild to dev-libs, foser added a very similar
  one to app-text. We've discovered this now and will keep his ebuild (which is
  better) in dev-libs (which is a more logical location). So, this is his
  ebuild.
  01 Apr 2003; danarmak <danarmak@gentoo.org> fribidi-0.10.4.ebuild:
  fribidi is a library implementing the Unicode Bidirectional Algorithm
  standard, used to output RTL text (fex. Hebrew and Arabic). gnome's pango
  actually uses a customized copy of it. Original submission by Edy (bug #7856).
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@ -1,5 +0,0 @@
 AUX fribidi-macos.patch 437 RMD160 f390024a41d7907d669d851ff7862e3f1bda3344 SHA1 598eb1b031d0167da52b0a25d54363ad61b3c338 SHA256 c707797eda69f8842eecf2722db59ece4c8ddd6730079f5db6c14c03065727c0
 DIST fribidi-0.19.2.tar.gz 668933 RMD160 4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 SHA1 3889469d96dbca3d8522231672e14cca77de4d5e SHA256 49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
 EBUILD fribidi-0.19.2.ebuild 666 RMD160 47b958dd68bb4ca539c1c5fc1ce95af4bbe46bee SHA1 1c68174e11b91f5dac1c1ad2d46ece3cdd28d536 SHA256 ebe006742a5b39b32bb82b4a78dc86fb3042dd5bdadefe74da66b8b54c192cc8
 MISC ChangeLog 5217 RMD160 33a3fd70af31dd3820a635d47cef8a58f3282da4 SHA1 c5accb1d7d4691fdff2a3a8c6ca8256e49ebf995 SHA256 427ed447c6deb3b3ad01da9a67388de6ca6c03c62a185f4830b518b871e03703
 MISC metadata.xml 228 RMD160 d65a6255b8f07a80a55bbee3b75d4fbf409e7bbb SHA1 bba2378881d0c8c6134d8bd9b3b599f564e3b7ed SHA256 9247f2e9698ec5fdf342458b10c5a7e671c4e10b1551f09de2a9e31193532bdb
--- a/dev-libs/fribidi/files/fribidi-macos.patch
+++ b/dev-libs/fribidi/files/fribidi-macos.patch
@ -1,11 +0,0 @@
 --- fribidi-0.10.4/configure.orig	Sat Feb 12 20:27:25 2005
 +++ fribidi-0.10.4/configure	Sat Feb 12 20:28:08 2005
@@ -3539,7 +3539,7 @@
     ;;
   darwin* | rhapsody*)
 -    allow_undefined_flag='-undefined suppress'
 +    allow_undefined_flag=''
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
--- a/dev-libs/fribidi/fribidi-0.19.2.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.2.ebuild
@ -1,17 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2.ebuild,v 1.1 2010/01/23 02:52:23 matsuu Exp $
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="http://fribidi.org/"
 SRC_URI="http://fribidi.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS README ChangeLog THANKS TODO
 }
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>no-herd</herd>
    <maintainer>
 		<email>matsuu@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/dev-libs/libgcal/ChangeLog
+++ b/dev-libs/libgcal/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for dev-libs/libgcal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  08 Dec 2008; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
  Initial checkin
--- a/dev-libs/libgcal/Manifest
+++ b/dev-libs/libgcal/Manifest
@ -1,4 +0,0 @@
 DIST libgcal-0.8.1.tar.gz 396113 RMD160 7b95c39a8267940f5cf985b4adb791b47c6b5113 SHA1 a1777d1d019d4456b812b5831a3354c64ff72c0d SHA256 562080aed105debdd050573c52fe042e43800090497f90ff49b78978465c190f
 EBUILD libgcal-0.8.1.ebuild 606 RMD160 aecf19287d662becce5e4b3f837669b5d1b7641f SHA1 64be37d77d3a377f7e2790b8f96b4cb42ee296e2 SHA256 65a0e6289e6fd5bddb7a8a1700bcfa75b0e60883f5e912ad740dd8644fd4b2d6
 MISC ChangeLog 202 RMD160 96f5ca53e7a1d930c5017d3ac83d0d79e6d1b769 SHA1 bc1401a7724f567ac6d2fcb743319ede89e7555c SHA256 78c289bd47d389dfaf9aa39c4ba3058a95dcde660d94445f8d11068a05bf8f9a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
--- a/dev-libs/libgcal/libgcal-0.8.1.ebuild
+++ b/dev-libs/libgcal/libgcal-0.8.1.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 #EAPI=0
 inherit eutils
 DESCRIPTION="C/C++ interface to the Google Data API"
 HOMEPAGE="http://code.google.com/p/libgcal/"
 SRC_URI="http://libgcal.googlecode.com/files/libgcal-0.8.1.tar.gz"
 LICENSE="BSD"
 SLOT="0.8"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND=">=dev-libs/libxml-1.8.17-r2
 	>=net-misc/curl-7.18.2"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/libgcal-0.8"
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
 src_install() {
 	einstall || die "einstall failed"
 }
--- a/dev-libs/libgcal/metadata.xml
+++ b/dev-libs/libgcal/metadata.xml
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>maintainer-wanted</herd>
 </pkgmetadata>
--- a/dev-util/boomerang/Manifest
+++ b/dev-util/boomerang/Manifest
@ -1,3 +0,0 @@
 AUX startboomerang-qt.sh 102 RMD160 d16392c466734fd7edd079a792fd015bc73745ee SHA1 05d90c7732b7e924a922a8274d5079e839c20b3a SHA256 c30f056ddf5f4896b33bf37c42900ecdf3cb8ff2c6342631bc8405ac578e25d4
 AUX startboomerang.sh 131 RMD160 c6e824c3a1e403e7053001ba79be687b269ff2d5 SHA1 9a6ef2aa6101ac077054d9e4dc3a172f9ca880f1 SHA256 6bf97ff1aad9a119dcb5b829dab42c316ff6bc44efe54fdb84b0c6e76d1502a7
 EBUILD boomerang-9999.ebuild 5278 RMD160 32e2a78226402a0f869b8d533d3e7a0537e2c0d1 SHA1 846a4cbd02825611b5d85d9ab0d39c32d3e1a7df SHA256 4bdc2428d9419feaa044e0d43f6de4d03ee9e90e5a580694f86a0cf1c0d7d87e
--- a/dev-util/boomerang/boomerang-9999.ebuild
+++ b/dev-util/boomerang/boomerang-9999.ebuild
@ -1,258 +0,0 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: Exp $
 ECVS_SERVER="boomerang.cvs.sourceforge.net:/cvsroot/boomerang"
 ECVS_MODULE="boomerang"
 ECVS_USER="anonymous"
 ECVS_PASS=""
 ECVS_CVS_OPTIONS="-dP"
 inherit cvs eutils
 S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="A general, open source, retargetable decompiler of machine code programs - (sources from CVS)."
 HOMEPAGE="http://boomerang.sourceforge.net"
 SRC_URI=""
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
 IUSE="qt4 examples"
 DEPEND="dev-libs/boehm-gc
 	dev-libs/expat
 	dev-util/cppunit
        qt4? ( >=x11-libs/qt-gui-4.1.2 )" 
 pkg_setup() {
 	if built_with_use dev-libs/boehm-gc nocxx; then
 		eerror "We need dev-libs/boehm-gc without nocxx enabled"
 		einfo "Recompile dev-libs/boehm-gc with use=\"-nocxx\""
 		die "Need cxx-support in dev-libs/boehm-gc"
 	fi
        ewarn "This is a LIVE CVS ebuild."
        ewarn "That means there are NO promises it will work."
        ewarn "If it fails to build, FIX THE CODE YOURSELF"
        ewarn "before reporting any issues."
 }
 src_unpack() {
        cvs_src_unpack
 }
 src_compile() {
        econf || die "econf failed."
        emake remote || die "emake remote failed"
        emake || die "emake failed"
        emake || die "emake failed"
 	if use qt4; then
 		cd qtgui2
 		qmake -project qtgui2-unx.pro
 		qmake qtgui2-unx.pro
 		emake || die "emake failed. try building without qt4 use flag."
 	fi
 }
 src_install() {
 	into /usr/local/boomerang
 	##bin
 	dodir ${DESTTREE}/bin	
 	dobin boomerang
 	dosym bin/boomerang ${DESTTREE}/boomerang
 	##startscript for main binary
 	dobin ${FILESDIR}/startboomerang.sh
 	dosym ${DESTTREE}/bin/startboomerang.sh /usr/bin/boomerang
 	if use qt4; then
 		##qt binary
 		newbin qtgui2/qtgui2-unx boomerang-qt
 		dosym bin/boomerang-qt ${DESTTREE}/boomerang-qt
 		##startscript for qt binary
 		dobin ${FILESDIR}/startboomerang-qt.sh
 		dosym ${DESTTREE}/bin/startboomerang-qt.sh /usr/bin/boomerang-qt
 		##bmp images
 		insinto ${DESTTREE}
 		doins *.bmp
 	fi
 	##lib
 	dodir ${DESTTREE}/lib
 	dolib lib/*.so
 	dosym ${DESTTREE}/lib/libBinaryFile.so /usr/lib/libBinaryFile.so
 	##licence file
 	dodir ${DESTTREE}/licence
 	insinto ${DESTTREE}/licence
 	doins LICENSE.TERMS	
 	##signatures
 	dodir ${DESTTREE}/signatures
 	insinto ${DESTTREE}/signatures
 	doins signatures/*.hs
 	doins signatures/*.h
 	##transformations
 	dodir ${DESTTREE}/transformations
 	insinto ${DESTTREE}/transformations
 	doins transformations/*.t
 	##frontend - ppc
 	dodir ${DESTTREE}/frontend/machine/ppc
 	insinto ${DESTTREE}/frontend/machine/ppc
 	doins frontend/machine/ppc/ppc.ssl
 	##frontend - hppa
 	dodir ${DESTTREE}/frontend/machine/hppa
 	insinto ${DESTTREE}/frontend/machine/hppa
 	doins frontend/machine/hppa/hppa.ssl
 	##frontend - st20
 	dodir ${DESTTREE}/frontend/machine/st20
 	insinto ${DESTTREE}/frontend/machine/st20
 	doins frontend/machine/st20/st20.ssl
 	##frontend - mc68k
 	dodir ${DESTTREE}/frontend/machine/mc68k
 	insinto ${DESTTREE}/frontend/machine/mc68k
 	doins frontend/machine/mc68k/mc68k.ssl
 	##frontend - sparc
 	dodir ${DESTTREE}/frontend/machine/sparc
 	insinto ${DESTTREE}/frontend/machine/sparc
 	doins frontend/machine/sparc/sparc.ssl
 	##frontend - pentium
 	dodir ${DESTTREE}/frontend/machine/pentium
 	insinto ${DESTTREE}/frontend/machine/pentium
 	doins frontend/machine/pentium/pentium.ssl
 	##examples, rm is used to exclude CVS folders. maybe there's a better way
 	if use examples; then
 		##examples - elf32-ppc
 		dodir ${DESTTREE}/test/elf32-ppc
 		insinto ${DESTTREE}/test/elf32-ppc
 		rm -rf test/elf32-ppc/CVS
 		doins test/elf32-ppc/*
 		##examples - hppa
 		dodir ${DESTTREE}/test/hppa
 		insinto ${DESTTREE}/test/hppa
 		rm -rf test/hppa/CVS
 		doins test/hppa/*
 		##examples - mc68328
 		dodir ${DESTTREE}/test/mc68328
 		insinto ${DESTTREE}/test/mc68328
 		rm -rf test/mc68328/CVS
 		doins test/mc68328/*
 		##examples - mips
 		dodir ${DESTTREE}/test/mips
 		insinto ${DESTTREE}/test/mips
 		rm -rf test/mips/CVS
 		doins test/mips/*
 		##examples - OSX
 		dodir ${DESTTREE}/test/OSX
 		insinto ${DESTTREE}/test/OSX
 		rm -rf test/OSX/CVS
 		doins test/OSX/*
 		##examples - pentium
 		dodir ${DESTTREE}/test/pentium
 		insinto ${DESTTREE}/test/pentium
 		rm -rf test/pentium/CVS
 		doins test/pentium/*
 		##examples - ppc
 		dodir ${DESTTREE}/test/ppc
 		insinto ${DESTTREE}/test/ppc
 		rm -rf test/ppc/CVS
 		doins test/ppc/*
 		##examples - source code of examples
 		dodir ${DESTTREE}/test/source
 		insinto ${DESTTREE}/test/source
 		rm -rf test/source/CVS
 		doins test/source/*
 		##examples - sparc
 		dodir ${DESTTREE}/test/sparc
 		insinto ${DESTTREE}/test/sparc
 		rm -rf test/sparc/CVS
 		doins test/sparc/*
 		##examples - windows
 		dodir ${DESTTREE}/test/windows
 		insinto ${DESTTREE}/test/windows
 		rm -rf test/windows/CVS
 		doins test/windows/*
 	fi
 	##end of src_install
 }
 pkg_postinst() {
 	einfo "You may now start boomerang by typing \"boomerang\"."
 	if use qt4; then
 		einfo "You also request the qt4-gui. You may start it by typing \"boomerang-qt\"."
 	fi
 	if use examples; then
 		einfo "Examples to test decompilation have been put into /usr/local/boomerang/test (including original source)"
 	fi
 }
--- a/dev-util/boomerang/files/startboomerang-qt.sh
+++ b/dev-util/boomerang/files/startboomerang-qt.sh
@ -1,7 +0,0 @@
 #!/bin/bash
 cd /usr/local/boomerang
 if [ "$*" = "" ]; then
 	./boomerang-qt
 else
 	./boomerang-qt $*
 fi
--- a/dev-util/boomerang/files/startboomerang.sh
+++ b/dev-util/boomerang/files/startboomerang.sh
@ -1,8 +0,0 @@
 #!/bin/bash
 workdir=`pwd`
 cd /usr/local/boomerang
 if [ "$*" = "" ]; then
 	./boomerang
 else
 	./boomerang -o ${workdir}/output $*
 fi
--- a/dev-util/libconf/ChangeLog
+++ b/dev-util/libconf/ChangeLog
@ -1,212 +0,0 @@
 # ChangeLog for dev-util/libconf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.48 2009/07/02 23:57:49 jer Exp $
  03 Sep 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
  add perl 8.10 patch
  02 Jul 2009; Jeroen Roovers <jer@gentoo.org> libconf-0.42.10-r1.ebuild:
  Marked ~hppa too.
  29 Feb 2008; Brent Baude <ranger@gentoo.org> libconf-0.42.10-r1.ebuild:
  keyworded ~arch for ppc64, bug 211757
  09 Feb 2007; Damien Krotkine <dams@gentoo.org> libconf-0.42.10-r1.ebuild:
  corrected homepage. bug #166128
  18 Jan 2007; Damien Krotkine <dams@gentoo.org> libconf-0.42.10-r1.ebuild:
  corrected SRC_URI, corrected copyright date
  18 Jan 2007; Damien Krotkine <dams@gentoo.org> libconf-0.40.00.ebuild:
  corrected SRC_URI, corrected copyright date
  28 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
  +files/0.42.10-fbsd.patch, libconf-0.42.10-r1.ebuild:
  Added fixes and patch for FreeBSD. ~x86-fbsd keyword added.
  28 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
  -libconf-0.42.00.ebuild, -libconf-0.42.00-r1.ebuild,
  -libconf-0.42.10.ebuild, libconf-0.42.10-r1.ebuild:
  Dropped old versions. Cleaned up the ebuild.
  07 Jun 2006; Damien Krotkine <dams@gentoo.org> libconf-0.40.00.ebuild:
  added xml IUSE, bug #135972
  02 Mar 2006; Damien Krotkine <dams@gentoo.org> +libconf-0.42.10-r1.ebuild:
  correcting bug #118123
 *libconf-0.42.10-r1 (02 Mar 2006)
  02 Mar 2006; Damien Krotkine <dams@gentoo.org> +libconf-0.42.10-r1.ebuild:
  correcting
  14 Dec 2005; Damien Krotkine <dams@gentoo.org> libconf-0.42.10.ebuild:
  setting DESTDIR when installing (bug #115469)
  26 Nov 2005; Tom Martin <slarti@gentoo.org> libconf-0.42.10.ebuild:
  Multilib fix -- ebuild will install to a multilib-strict environment now.
  Also, remove call to make check in src_compile.
  23 Nov 2005; Luis Medinas <metalgod@gentoo.org> libconf-0.40.00.ebuild:
  Stable on amd64. Fixing bug #113291.
 *libconf-0.42.10 (22 Nov 2005)
  22 Nov 2005; Damien Krotkine <dams@gentoo.org> +libconf-0.42.10.ebuild:
  cleaned old version, version bump, added python binding compilation
 *libconf-0.42.00-r1 (20 Nov 2005)
  20 Nov 2005; Damien Krotkine <dams@gentoo.org> +libconf-0.42.00-r1.ebuild:
  removed stupid reference to wxwidgets
 *libconf-0.42.00 (18 Nov 2005)
  18 Nov 2005; Damien Krotkine <dams@gentoo.org> +libconf-0.42.00.ebuild:
  version bump : python, ruby, bash bindings, xml support
  30 Oct 2005; Jason Wever <weeve@gentoo.org> libconf-0.40.00.ebuild:
  Stable on SPARC.
  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> libconf-0.40.00.ebuild:
  Mark 0.40.00 stable on ia64
  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> libconf-0.40.00.ebuild:
  Mark 0.40.00 stable on alpha
  03 Sep 2005; Markus Rothe <corsair@gentoo.org> libconf-0.40.00.ebuild:
  Stable on ppc64
 *libconf-0.40.00 (27 Aug 2005)
  27 Aug 2005; Damien Krotkine <dams@gentoo.org> +libconf-0.40.00.ebuild:
  major version bump
  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> libconf-0.39.21.ebuild:
  stable on ia64
  12 Jul 2005; Simon Stelling <blubb@gentoo.org> libconf-0.39.21.ebuild:
  stable on amd64
 *libconf-0.39.21 (20 Jun 2005)
  20 Jun 2005; <dams@gentoo.org> +libconf-0.39.21.ebuild:
  new version
  02 Jun 2005; <dams@gentoo.org> libconf-0.39.18.ebuild:
  marked stable on ppc64
 *libconf-0.39.18 (02 Jun 2005)
  02 Jun 2005; <dams@gentoo.org> +libconf-0.39.18.ebuild:
  new version
 *libconf-0.39.16 (08 May 2005)
  08 May 2005; <dams@gentoo.org> +libconf-0.39.16.ebuild:
  version bump
 *libconf-0.39.15 (08 May 2005)
  08 May 2005; <dams@gentoo.org> +libconf-0.39.15.ebuild:
  version bump
 *libconf-0.39.14 (07 May 2005)
  07 May 2005; <dams@gentoo.org> +libconf-0.39.14.ebuild:
  version bump
  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> libconf-0.39.8.ebuild:
  stable on ia64
 *libconf-0.39.13 (29 Mar 2005)
  29 Mar 2005; <dams@gentoo.org> +libconf-0.39.13.ebuild:
  version 0.39.13 : xml import/export, resolv template correction
 *libconf-0.39.12 (21 Mar 2005)
  21 Mar 2005; <dams@gentoo.org> +libconf-0.39.12.ebuild:
  version 0.39.12
  07 Mar 2005; Markus Rothe <corsair@gentoo.org> libconf-0.39.8.ebuild:
  Stable on ppc64
 *libconf-0.39.11 (19 Feb 2005)
  19 Feb 2005; <dams@gentoo.org> +libconf-0.39.11.ebuild:
  version 0.39.11, command line tool correction
 *libconf-0.39.10 (17 Feb 2005)
  17 Feb 2005; <dams@gentoo.org> +libconf-0.39.10.ebuild:
  correcting a multiple filehandlers bug
 *libconf-0.39.9 (15 Feb 2005)
  15 Feb 2005; <dams@gentoo.org> +libconf-0.39.9.ebuild:
  version 0.39.9
 *libconf-0.39.8 (24 Jan 2005)
  24 Jan 2005; <dams@gentoo.org> +libconf-0.39.8.ebuild:
  typo
  24 Jan 2005; <dams@gentoo.org> :
  - true-shell use debug
  - new feature : xml import and export
 *libconf-0.39.7 (17 Jan 2005)
  17 Jan 2005; <dams@gentoo.org> +libconf-0.39.7.ebuild:
  - the Shell template can now use a true shell binary to use shell
  interpretation
 *libconf-0.39.6 (07 Jan 2005)
  07 Jan 2005; <dams@gentoo.org> +libconf-0.39.6.ebuild:
  . version 0.39.6
  . corrected 2005 copyrights
 *libconf-0.39.5 (08 Dec 2004)
  08 Dec 2004; <dams@gentoo.org> +libconf-0.39.5.ebuild:
  version 0.39.5, needed for latest profuse
 *libconf-0.39.4 (30 Nov 2004)
  30 Nov 2004; <dams@gentoo.org> +libconf-0.39.4.ebuild:
  version 0.39.4
  26 Nov 2004; <dams@gentoo.org> :
  version 0.39.3
 *libconf-0.39.2 (14 Nov 2004)
  14 Nov 2004; <dams@gentoo.org> +libconf-0.39.2.ebuild:
  version 0.39.2, required for profuse
 *libconf-0.39.1 (19 Oct 2004)
  19 Oct 2004; <dams@gentoo.org> +libconf-0.39.1.ebuild:
  version 0.39.1 (corrects etags bug, thanks pylon)
 *libconf-0.39_alpha (10 Oct 2004)
  10 Oct 2004; <dams@gentoo.org> +libconf-0.39_alpha.ebuild:
  version 0.39_alpha
 *libconf-0.29 (09 Mar 2004)
  09 Mar 2004; Dams,,, <dams@gentoo.org> libconf-0.29.ebuild:
  . version 0.29
  . added make check in compile rule
 *libconf-0.28 (26 Feb 2004)
  26 Feb 2004; Seemant Kulleen <seemant@gentoo.org> libconf-0.28.ebuild,
  metadata.xml:
  New abstraction library and utilities for interacting with configuration
  files. The app/lib itself is written by Dams (at gentoo dot org). Seemant
  committed it to portage.
--- a/dev-util/libconf/Manifest
+++ b/dev-util/libconf/Manifest
@ -1,6 +0,0 @@
 AUX 0.42.10-fbsd.patch 1850 RMD160 534d06dac6a2190a21d03cbc01e97bc50d2f17f1 SHA1 22688c4f67bb36d33672881ce03934b98a5c4b1e SHA256 760b13b41e618c7de9a0132e00e7be3f00cc64cfa51869fd3bbf432164183e73
 AUX libconf-0.42.10-perl510.patch 486 RMD160 c541f314b16acdbd8a6be8cfcf591f93d2ad1486 SHA1 3eae14f495303b5bc32700e5d3bb4a8cb2aebc47 SHA256 88176bf4ac5d04e74bd86914a4408a0902f5853a7e1f4a5fb1685fbb80262372
 DIST perl-Libconf-0.42.10.tar.bz2 203303 RMD160 55e59e22fb8f2a0b4954abe52af03a58a1ed9847 SHA1 278200ceb40a51be14a250bcf35f4f0d6e46afb3 SHA256 91fc840042f0072c2de8520a044e5842df63c0f6f1c41ff989090c34c01ad40e
 EBUILD libconf-0.42.10-r1.ebuild 1613 RMD160 5284dd0361908358a144196c5d0d73b54f932a67 SHA1 38ba952974489fe25ee62cc41d9baa931206f57d SHA256 e5565b1551beccd6e5e2dc0337845e43b90c1d2ad8ebcecc96ee0275100f52f4
 MISC ChangeLog 6267 RMD160 82d107a261de5333d1eeb6cb2c598967f72045c9 SHA1 8653cb1f60b1a2a0a17b0dd711e0ed7eed794e1e SHA256 39ba1619fec158f015b07ab34f97775eb6389e7442267e86ffd9d9dd332c481d
 MISC metadata.xml 284 RMD160 d34a08cf3b7481409cfe53b033da70d654e7a132 SHA1 65de00127c5630c17a87531fc68e5dcb6d06bc73 SHA256 b3f4651cafe0c058bff035950a89a8fd476f19a06bdc3b7f5ed0b5981ddd333a
--- a/dev-util/libconf/files/0.42.10-fbsd.patch
+++ b/dev-util/libconf/files/0.42.10-fbsd.patch
@ -1,51 +0,0 @@
 --- bindings/c/src/conf2xml.c.orig	2006-11-28 09:49:23 +0100
 +++ bindings/c/src/conf2xml.c	2006-11-28 09:49:34 +0100
@@ -7,7 +7,6 @@
 #include <string.h>
 #include "conf2xml.h"
 -#include <error.h>
 #include <errno.h>
 /* #define ARGC(a) ((sizeof(a)/sizeof(a[0]))) */
 /* #define STR_MAX_SIZE 256 */
@@ -39,17 +38,17 @@
 char * conf2xml (char *filename, char *template, char *template_options) {
     STRLEN l;
 -    if (my_perl == NULL) error (NOT_INITIALIZED, 0, "conf2xml has not been initialized. Call conf2xml_init first");
 +    if (my_perl == NULL) errc (NOT_INITIALIZED, 0, "conf2xml has not been initialized. Call conf2xml_init first");
     if (!template) {
         template = malloc(sizeof(char));
 -        if (!template) error (ENOMEM, ENOMEM, NULL);
 +        if (!template) errc (ENOMEM, ENOMEM, NULL);
         *template = '\0';
     }
     if (!template_options) {
         template_options = malloc(sizeof(char));
 -        if (!template_options) error (ENOMEM, ENOMEM, NULL);;
 +        if (!template_options) errc (ENOMEM, ENOMEM, NULL);;
         *template_options = '\0';
     }
@@ -66,7 +65,7 @@
                                       1
                                       );
     char *perl_code = malloc(sizeof(char) * code_length);
 -    if (!perl_code) error (ENOMEM, ENOMEM, NULL);;
 +    if (!perl_code) errc (ENOMEM, ENOMEM, NULL);;
     *perl_code = '\0';
     strncat(perl_code, perl_code1, strlen(perl_code1));
     strncat(perl_code, filename, strlen(filename));
 --- bindings/python/src/setup.py.orig	2006-11-28 09:50:43 +0100
 +++ bindings/python/src/setup.py	2006-11-28 09:50:50 +0100
@@ -12,7 +12,6 @@
     ext_modules=[
         Extension(
             'conf2xml',
 -            sources=['conf2xmlmodule.c'],
 -            libraries=['dl'],
 +            sources=['conf2xmlmodule.c']
             )]
     )
--- a/dev-util/libconf/files/libconf-0.42.10-perl510.patch
+++ b/dev-util/libconf/files/libconf-0.42.10-perl510.patch
@ -1,11 +0,0 @@
 --- perl-Libconf-0.42.10/bindings/c/src/conf2xml.c	2005-11-07 01:02:03.000000000 -0800
 +++ perl-Libconf-0.42.10/bindings/c/src/conf2xml.c.new	2008-07-22 17:01:33.000000000 -0700
@@ -19,7 +19,7 @@
     char *embedding[] = { "", "-e", "0" };
     if (my_perl != NULL) conf2xml_free();
 -    PERL_SYS_INIT3(&argc,&argv,&env);
 +    PERL_SYS_INIT3(NULL,NULL,NULL);
     my_perl = perl_alloc();
     perl_construct( my_perl );
     perl_parse(my_perl, xs_init, 3, embedding, (char **)NULL);
--- a/dev-util/libconf/libconf-0.42.10-r1.ebuild
+++ b/dev-util/libconf/libconf-0.42.10-r1.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=2
 inherit eutils multilib toolchain-funcs
 MY_P=perl-Libconf-${PV}
 DESCRIPTION="Centralized abstraction layer for system configuration files"
 HOMEPAGE="http://damien.krotkine.com/libconf/"
 SRC_URI="http://damien.krotkine.com/libconf/dist/${MY_P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="python ruby"
 DEPEND="dev-lang/perl
 	dev-perl/DelimMatch
 	dev-perl/XML-Twig
 	python? ( >=dev-lang/python-2.4.2 )
 	ruby? ( >=dev-lang/ruby-1.8.3 )"
 S="${WORKDIR}"/${MY_P}
 bindings() {
 	local mybindings
 	mybindings="bash"
 	use python && mybindings="${mybindings} python"
 	use ruby && mybindings="${mybindings} ruby"
 	echo ${mybindings}
 }
 src_prepare() {
 	[[ ${USERLAND} == *BSD ]] && epatch "${FILESDIR}"/${PV}-fbsd.patch
 	epatch "${FILESDIR}"/${P}-perl510.patch
 	# Multilib fix
 	sed -i \
 		-e "/^LIB_DIR/ { s:lib:$(get_libdir): }" \
 		-e 's/^CF=-Wall/CF=$(CFLAGS)/' \
 		bindings/c/src/Makefile || die "sed failed"
 	sed -i \
 		-e 's/        /\t/' \
 		perl-Libconf/Makefile || die "sed failed"
 	sed -i \
 		-e '/^MAKE =/d' \
 		Makefile perl-Libconf/Makefile || die "sed failed"
 }
 src_compile() {
 	emake \
 		BINDINGS="$(bindings)" \
 		CC=$(tc-getCC) \
 		|| die "make failed"
 }
 src_install() {
 	emake \
 		BINDINGS="$(bindings)" \
 		PREFIX="${D}"/usr DESTDIR="${D}" ROOT="${D}" \
 		CPA="cp -pR" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog \
 		bindings/ruby/src/{AUTHORS,README} \
 		bindings/python/src/README
 }
--- a/dev-util/libconf/metadata.xml
+++ b/dev-util/libconf/metadata.xml
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>perl</herd>
 	<maintainer>
 		<email>dams@gentoo.org</email>
 		<name>Primary Maintainer is Dams. Secondary is Seemant</name>
 	</maintainer>
 </pkgmetadata>
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@ -1,5 +0,0 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e
 AUX pykde4.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad1e3fe SHA1 8167ae067f6cb47b7685c2d052b9d57d3e88ba10 SHA256 94cbc246a62fe0256e3a57bdfd1aae6b1a313229031433f65a389442c7fa10e2
 DIST kdebindings-4.5.1.tar.bz2 6325783 RMD160 8d5425cc973f3a73fa22f89badb437945f453d93 SHA1 0f75b9b787fd58ff5e36ce6ac87329ea31ad66b6 SHA256 5cb33f3cb2ea4d54f0bc851fe2f0eaf76df30333108a862a60129cc5e9710bc9
 EBUILD pykde4-4.5.1-r1.ebuild 1920 RMD160 12715c35bf4a43a7665bc3f3dc00a69154f55898 SHA1 1097151453de8e1bce3677382157c276bbdd5d62 SHA256 416e0d6bf6b50023771e85040667cdd44fe9d1d827470d460d60cf2b04e3e531
--- a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
+++ b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
@ -1,22 +0,0 @@
 diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
 --- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt	2010-03-29 14:57:40.000000000 +0200
 +++ pykde4-4.4.3/python/pykde4/CMakeLists.txt	2010-05-31 15:49:17.095615617 +0200
@@ -75,6 +75,9 @@
     ${KDEPIMLIBS_INCLUDE_DIRS}
 )
 +# Pull in ARM configuration options if needed
 +STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
 +
 SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
 SET(SIP_CONCAT_PARTS 8)
 IF (WIN32)
@@ -82,7 +85,7 @@
 ELSE (WIN32)
     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
 ENDIF (WIN32)
 -SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
 +SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
 # Use an extra option when compiling on Python 3.
 IF (PYTHON_3)
--- a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
+++ b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
@ -1,12 +0,0 @@
 diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip
 --- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip	2010-05-27 19:21:46.000000000 +0200
 +++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip	2010-07-15 06:36:27.000000000 +0200
@@ -19,7 +19,7 @@
 namespace Akonadi
 {
 -class AddressAttribute : Akonadi::Attribute
 +class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/
 {
 %TypeHeaderCode
 #include <akonadi/kmime/addressattribute.h>
--- a/kde-base/pykde4/files/pykde4.patch
+++ b/kde-base/pykde4/files/pykde4.patch
@ -1,64 +0,0 @@
 --- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip	2010/01/16 10:06:39	1075490
 +++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip	2010/09/01 15:31:50	1170602
@@ -733,61 +733,6 @@
 };
 -%MappedType QList<uint>
 -{
 -%TypeHeaderCode
 -#include <qlist.h>
 -%End
 -
 -%ConvertFromTypeCode
 -    // Create the list.
 -    PyObject *l;
 -
 -    if ((l = PyList_New(sipCpp->size())) == NULL)
 -        return NULL;
 -
 -    // Set the list elements.
 -    for (int i = 0; i < sipCpp->size(); ++i) {
 -        PyObject *pobj;
 -
 -#if PY_MAJOR_VERSION >= 3
 -        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
 -#else
 -        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
 -#endif
 -            Py_DECREF(l);
 -
 -            return NULL;
 -        }
 -
 -        PyList_SET_ITEM(l, i, pobj);
 -    }
 -
 -    return l;
 -%End
 -
 -%ConvertToTypeCode
 -    // Check the type if that is all that is required.
 -    if (sipIsErr == NULL)
 -        return PyList_Check(sipPy);
 -
 -    QList<uint> *ql = new QList<uint>;
 - 
 -    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
 -#if PY_MAJOR_VERSION >= 3
 -        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
 -#else
 -        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
 -#endif        
 -    }
 -    
 -    *sipCppPtr = ql;
 - 
 -    return sipGetState(sipTransferObj);
 -%End
 -};
 -
 -
 template <TYPE*>
 %MappedType QStack<TYPE*>
 {
--- a/kde-base/pykde4/pykde4-4.5.1-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.1-r1.ebuild
@ -1,84 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 KMNAME="kdebindings"
 KMMODULE="python/pykde4"
 OPENGL_REQUIRED="always"
 PYTHON_USE_WITH="threads"
 RESTRICT_PYTHON_ABIS="2.4"
 inherit python kde4-meta
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples semantic-desktop"
 # blocker added due to compatibility issues and error during compile time
 DEPEND="
 	!dev-python/pykde
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup
 }
 src_prepare() {
 	kde4-meta_src_prepare
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
 	# See bug 322351
 	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
 	epatch "${FILESDIR}/pykde4.patch"
 }
 src_configure() {
 	mycmakeargs=(
 		-DWITH_QScintilla=OFF
 		-DWITH_PolkitQt=OFF
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 	)
 	kde4-meta_src_configure
 }
 src_install() {
 	use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
 	kde4-meta_src_install
 	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 	python_clean_installation_image -q
 }
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 	python_mod_optimize PyKDE4 PyQt4
 	if use examples; then
 		echo
 		elog "PyKDE4 examples have been installed to"
 		elog "${EKDEDIR}/share/apps/${PN}/examples"
 		echo
 	fi
 }
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 	python_mod_cleanup PyKDE4 PyQt4
 }
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@ -1,16 +0,0 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  09 May 2010; Mario Fetka <mario.fetka@gmail.com>
  -net-snmp-5.4.1.1-r1.ebuild, -net-snmp-5.4.2.1-r1.ebuild,
  -net-snmp-5.4.2.1-r2.ebuild, +net-snmp-5.4.2.1-r4.ebuild:
  Bump rpm patch
  22 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
  +files/rpm514-netsnmp-5.4.1.1.patch, +net-snmp-5.4.2.1-r1.ebuild:
  Bump
  04 Nov 2008; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
  add rpm 5 patch
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@ -1,26 +0,0 @@
 AUX CVE-2008-6123.patch 867 RMD160 1e8b6521ae0955681493c1ba594eb0344183e147 SHA1 3742c405fab9ac829acc93383bc39ba5b39962e9 SHA256 31a9b72b252582cd84e7f673b670ebbd2153dc719894aa668a48b24d6ba516f6
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874
 AUX net-snmp-5.4-exec-crash.patch 567 RMD160 fe110ace0ae451a8cf25d18d4133fb0d85dcaf5c SHA1 4a4538958e4c805981e1f0da4d6f1980a03aeab6 SHA256 2c4d3d281380d394d0d349c37839bb89f3d82d3e1c43513e042d24126441741c
 AUX net-snmp-5.4-makefile.patch 597 RMD160 90f8e6db0a05fd21c06e98b65b4bbd377f931fe9 SHA1 2ff51b2ab2df2224dd34ca1af16430fbf0b97927 SHA256 fd8c6ceda9c5d99cd92f81a7977d2134960ee14fac3ab9f1f8c6d03c6a69edb1
 AUX net-snmp-5.4.1-CVE-2008-2292.patch 6212 RMD160 79b2e05df4623972dbaea2dd92dea4a46975c566 SHA1 7fe5f5e9785deeaa1852de76fcba17cbbf9781dc SHA256 10908598aa445bad84708af3ebba1e6a6d985a8008e0c4be42df556851f6a48d
 AUX net-snmp-5.4.1-clientaddr-fix.patch 4013 RMD160 52c45d7dd34b5aadcfd7ef48c445d47b5491936d SHA1 714fc3fccc65516ae2a6d836ce181edfd4dc83c3 SHA256 15a8f05e47eb337d8963ed2b1fd81ecb00fe9b631d3281507bdc1b17c5d542cb
 AUX net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch 16053 RMD160 1d33a23b165946f7dd4e97b329c79d27c42ec913 SHA1 c4a107c35cf96b3c52a3156ab9f999b46582b693 SHA256 2d3aad8d76046e11a520d45bc5d3304b1ceff91c6d5a5510dc020aae47506b3d
 AUX net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch 4740 RMD160 305f962976c6afc39b0ee37706f34d05ea768874 SHA1 93b806c407048cba4f5c63137df1e819c83d0010 SHA256 0872a11f48106f1a2a9c4a8a894abe31b04ee607bdfd44b8207c8e659213ef31
 AUX net-snmp-5.4.1-perl-asneeded.patch 1219 RMD160 caced600c35165603069e62a17a664d7a0180586 SHA1 89bedb2424d65176a9bfba8c9b318b1d50b5b3ed SHA256 42640b545363cd5c6c7eef6b17b10c1d256e189ceb7b7c874baa4041de24e151
 AUX net-snmp-5.4.1-process-count-race.patch 1489 RMD160 221f218270b83afec95d1efd260109b8baf05626 SHA1 3986f4789c145dd7182bf5f7d94a1cda0504ce5c SHA256 74a6e001de7a855079be988dd0cb23190095082e1a9adaefb9a9cac677ffa116
 AUX net-snmp-5.4.1-sensors3-version_detect.patch 1391 RMD160 eba5c1cba2fc5d0484143eb4b41f656f5f72bee4 SHA1 8c8ebcc9e4725e91cc7b07cdd45cbcf6e2ed806e SHA256 e18f7bd358c4f587793f9e9250489200d2708b50529dfe222f04b71617fa1e59
 AUX net-snmp-5.4.1-sensors3.patch 48401 RMD160 9899c587eb252cf9edac758133a420ef0307c315 SHA1 cd5adc2fab5c1d58c8a318d34aa3fcd4fd25c455 SHA256 e74e06a5f23350a2851fdc9f419335767d898ec66dd809e1c0413e39034d6f53
 AUX net-snmp-5.4.1-suppresssuppress-annoying.patch 800 RMD160 aa23a30241ae64aeed6a08a630326fd7c2e0f9fe SHA1 2b99c56d1f659f324c5676d48ab257ea3b55467f SHA256 f5249b782079be96256ab6e7a0d398c04dfbcabffa7f4c716fe1abd39897aabe
 AUX net-snmp-5.4.1.1-rpm5-1.patch 2258 RMD160 e29716d03c86874579c1fb2f3edafd5867991286 SHA1 3a403ef15bb2edf151531b5fd291df6937ef216e SHA256 ad958fcf18565930e428027e6ea60546865947b149255b2e166e9fe2a8726ee5
 AUX net-snmp-lm_sensors.patch 13686 RMD160 b2e67c6f5a5347442fbaa97c9ce209f1d9bed194 SHA1 3e795339fc93306a4d662feeaa16faca2509a058 SHA256 51dc2363a687d9f4e65b0a59e767b33129d07623a0b4da07b685e406d2576b86
 AUX rpm514-netsnmp-5.4.1.1.patch 11813 RMD160 de2ed34c72280d2da308a0f1e0b293d51f2c391c SHA1 5856bc7531c40e7b9be267b5cd117d6ddf7dc043 SHA256 801039ba6a484fe83c7e1940e4227fccafe4c7cf1962f9fcda01e70869abaa28
 AUX snmpd.conf 598 RMD160 c72a20fe6d4682ceea533587762782d62906b630 SHA1 51ebdca93c68ca04b7f402fad4f504422ec2c6cf SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598
 AUX snmpd.init 1054 RMD160 6cc814d19524e1899b4bb9539ee9752304451bc9 SHA1 ed2b1a4bd7da84ca6294c0df66cace2e7c0ffe72 SHA256 824ae327db4d76fe4cdc882f06ac989e510ee1ee96c90137ab84bc18446ba8b6
 AUX snmpd.rc7 706 RMD160 137d85e5f2b7cae62e214141aabcec495777007e SHA1 8d94d3bb2d3b43e20604030dc585c735685cf99b SHA256 93337ebeac92ec0073c896db0a4384beebf84ee17365bdc2594285fd33ac7dfe
 AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3
 AUX snmptrapd.init 624 RMD160 799faf488a62bc219d3765ed6d6283ca7764ad1c SHA1 1fdef5a0a29f181c2df31b9d7adc4d4ebb8b018c SHA256 0e6dae4ca0213be9f9311c8dacdf36e7fea05150db48d15660506d53abda5a39
 AUX snmptrapd.rc7 557 RMD160 e67117fbcb0a6f8668cb1abbc8fcfcb548ebfdb5 SHA1 dcaac6c0f9e086e49f653f100e0c3f9a7f65db1d SHA256 3594345cdf3c9a5a04073ec11a54e4a19881b27288cdbf22874cca5d0a0f624c
 DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
 EBUILD net-snmp-5.4.2.1-r4.ebuild 5843 RMD160 54ca0282db67d877bda09bfab8396e4bddb24bc9 SHA1 18cb85f3b53b6ebc20abf94ad57f5acb2e844f4a SHA256 c24133c4ae84ac0705680f7d853abed3e6608e4073eb5d2e4e5045ca0620e81f
 MISC ChangeLog 519 RMD160 91ab2308122a2cefaf60350866c60fdd186d5ec5 SHA1 1b81f13fc245938bef551e25bdc9d7245a1ca3be SHA256 f84e6afeaacf242683c69acb3e26f3f91818459591e61e1e048da12bd6733938
 MISC metadata.xml 674 RMD160 102cd7df943ef25f0f462f2520fa77ceac3b5680 SHA1 90b51daab27e161a48feed336a348a8ecf0865c2 SHA256 233feade72f1b013bb5b0739478ab7200727db25a1d06977d0d122862565de24
--- a/net-analyzer/net-snmp/files/CVE-2008-6123.patch
+++ b/net-analyzer/net-snmp/files/CVE-2008-6123.patch
@ -1,19 +0,0 @@
 diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c
 --- snmplib.orig/snmpUDPDomain.c	2007-10-11 22:46:30.000000000 +0200
 +++ snmplib/snmpUDPDomain.c	2009-07-10 23:41:37.000000000 +0200
@@ -104,12 +110,12 @@
 	char tmp[64];
         to = (struct sockaddr_in *) &(addr_pair->remote_addr);
         if (to == NULL) {
 -            sprintf(tmp, "UDP: [%s]->unknown",
 +            sprintf(tmp, "UDP: unknown->[%s]",
                     inet_ntoa(addr_pair->local_addr));
         } else {
 -            sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr));
 -            sprintf(tmp + strlen(tmp), "[%s]:%hd",
 +            sprintf(tmp, "UDP: [%s]:%hu->",
                     inet_ntoa(to->sin_addr), ntohs(to->sin_port));
 +            sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr));
         }
         return strdup(tmp);
     }
--- a/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
@ -1,12 +0,0 @@
 https://bugzilla.redhat.com/show_bug.cgi?id=248329
 --- net-snmp-5.1.2/local/snmpconf.orig	2004-04-20 16:20:51.000000000 +0200
 +++ net-snmp-5.1.2/local/snmpconf	2007-07-09 15:34:48.000000000 +0200
@@ -585,6 +585,7 @@
 	    }
 	}
 	close(O);
 +	system("restorecon $outputf");
     }
 }
--- a/net-analyzer/net-snmp/files/net-snmp-5.4-exec-crash.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4-exec-crash.patch
@ -1,14 +0,0 @@
 https://bugzilla.redhat.com/show_bug.cgi?id=243536
 --- net-snmp-5.4/agent/mibgroup/agent/extend.c.orig	2006-10-18 21:07:35.000000000 +0200
 +++ net-snmp-5.4/agent/mibgroup/agent/extend.c	2007-06-27 14:30:08.000000000 +0200
@@ -448,6 +448,9 @@
         extension->command  = strdup( exec_command );
         if (cptr)
             extension->args = strdup( cptr );
 +    } else {
 +    	snmp_log(LOG_ERR, "Duplicate MIBOID '%s' detected in exec statement, only the first one will be used.\n", exec_name);
 +    	return;
     }
 #ifndef USING_UCD_SNMP_EXTENSIBLE_MODULE
--- a/net-analyzer/net-snmp/files/net-snmp-5.4-makefile.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4-makefile.patch
@ -1,20 +0,0 @@
 diff -ru net-snmp-5.4~/agent/mibgroup/Makefile.in net-snmp-5.4/agent/mibgroup/Makefile.in
 --- net-snmp-5.4~/agent/mibgroup/Makefile.in	2006-11-26 16:43:18.000000000 +0100
 +++ net-snmp-5.4/agent/mibgroup/Makefile.in	2006-11-26 16:44:49.000000000 +0100
@@ -22,9 +22,13 @@
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 -OBJS  = @mib_module_list_o@
 -LOBJS = @mib_module_list_lo@
 -SRCS  = @mib_module_list_c@
 +@mib_module_list_o@
 +@mib_module_list_lo@
 +@mib_module_list_c@
 +
 +OBJS  = $(mib_module_list_o)
 +LOBJS = $(mib_module_list_lo)
 +SRCS  = $(mib_module_list_c)
 all: standardall $(LOBJS)
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-CVE-2008-2292.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-CVE-2008-2292.patch
@ -1,192 +0,0 @@
 r16770 | dts12 | 2007-12-22 22:22:44 +0300 (Сбт, 22 Дек 2007) | 2 lines
 CHANGES: perl: BUG: 1826174: Check for buffer overflow when printing values.
 CHANGES: python: BUG: 1826174: Check for buffer overflow when printing values.
 Addresses CVE-2008-2292
 --- perl/SNMP/SNMP.xs	(revision 16769)
 +++ perl/SNMP/SNMP.xs	(revision 16770)
@@ -470,14 +470,16 @@
            if (flag == USE_ENUMS) {
               for(ep = tp->enums; ep; ep = ep->next) {
                  if (ep->value == *var->val.integer) {
 -                    strcpy(buf, ep->label);
 +                    strncpy(buf, ep->label, buf_len);
 +                    buf[buf_len-1] = '\0';
                     len = strlen(buf);
                     break;
                  }
               }
            }
            if (!len) {
 -              sprintf(buf,"%ld", *var->val.integer);
 +              snprintf(buf, buf_len, "%ld", *var->val.integer);
 +              buf[buf_len-1] = '\0';
               len = strlen(buf);
            }
            break;
@@ -486,21 +488,25 @@
         case ASN_COUNTER:
         case ASN_TIMETICKS:
         case ASN_UINTEGER:
 -           sprintf(buf,"%lu", (unsigned long) *var->val.integer);
 +           snprintf(buf, buf_len, "%lu", (unsigned long) *var->val.integer);
 +           buf[buf_len-1] = '\0';
            len = strlen(buf);
            break;
         case ASN_OCTET_STR:
         case ASN_OPAQUE:
 -           memcpy(buf, (char*)var->val.string, var->val_len);
            len = var->val_len;
 +           if ( len > buf_len )
 +               len = buf_len;
 +           memcpy(buf, (char*)var->val.string, len);
            break;
         case ASN_IPADDRESS:
 -          ip = (u_char*)var->val.string;
 -          sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
 -          len = strlen(buf);
 -          break;
 +           ip = (u_char*)var->val.string;
 +           snprintf(buf, buf_len, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
 +           buf[buf_len-1] = '\0';
 +           len = strlen(buf);
 +           break;
         case ASN_NULL:
            break;
@@ -512,14 +518,14 @@
           break;
 	case SNMP_ENDOFMIBVIEW:
 -          sprintf(buf,"%s", "ENDOFMIBVIEW");
 -	  break;
 +           snprintf(buf, buf_len, "%s", "ENDOFMIBVIEW");
 +	   break;
 	case SNMP_NOSUCHOBJECT:
 -	  sprintf(buf,"%s", "NOSUCHOBJECT");
 -	  break;
 +	   snprintf(buf, buf_len, "%s", "NOSUCHOBJECT");
 +	   break;
 	case SNMP_NOSUCHINSTANCE:
 -	  sprintf(buf,"%s", "NOSUCHINSTANCE");
 -	  break;
 +	   snprintf(buf, buf_len, "%s", "NOSUCHINSTANCE");
 +	   break;
         case ASN_COUNTER64:
 #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
@@ -538,19 +544,19 @@
 #endif
         case ASN_BIT_STR:
 -            snprint_bitstring(buf, sizeof(buf), var, NULL, NULL, NULL);
 +            snprint_bitstring(buf, buf_len, var, NULL, NULL, NULL);
             len = strlen(buf);
             break;
 #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
         case ASN_OPAQUE_FLOAT:
 -	  if (var->val.floatVal)
 -	    sprintf(buf,"%f", *var->val.floatVal);
 -         break;
 +           if (var->val.floatVal)
 +              snprintf(buf, buf_len, "%f", *var->val.floatVal);
 +           break;
         case ASN_OPAQUE_DOUBLE:
 -	  if (var->val.doubleVal)
 -	    sprintf(buf,"%f", *var->val.doubleVal);
 -         break;
 +           if (var->val.doubleVal)
 +              snprintf(buf, buf_len, "%f", *var->val.doubleVal);
 +           break;
 #endif
         case ASN_NSAP:
 --- python/netsnmp/client_intf.c	(revision 16961)
 +++ python/netsnmp/client_intf.c	(revision 16962)
@@ -330,14 +330,15 @@
            if (flag == USE_ENUMS) {
               for(ep = tp->enums; ep; ep = ep->next) {
                  if (ep->value == *var->val.integer) {
 -                    strcpy(buf, ep->label);
 +                    strncpy(buf, ep->label, buf_len);
 +                    buf[buf_len -1] = 0;
                     len = STRLEN(buf);
                     break;
                  }
               }
            }
            if (!len) {
 -              sprintf(buf,"%ld", *var->val.integer);
 +              snprintf(buf,"%ld", buf_len, *var->val.integer);
               len = STRLEN(buf);
            }
            break;
@@ -346,19 +347,21 @@
         case ASN_COUNTER:
         case ASN_TIMETICKS:
         case ASN_UINTEGER:
 -           sprintf(buf,"%lu", (unsigned long) *var->val.integer);
 +           snprintf(buf, buf_len, "%lu", (unsigned long) *var->val.integer);
            len = STRLEN(buf);
            break;
         case ASN_OCTET_STR:
         case ASN_OPAQUE:
 -           memcpy(buf, (char*)var->val.string, var->val_len);
            len = var->val_len;
 +           if (len > buf_len)
 +               len = buf_len;
 +           memcpy(buf, (char*)var->val.string, len);
            break;
         case ASN_IPADDRESS:
           ip = (u_char*)var->val.string;
 -          sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
 +          snprintf(buf, buf_len, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
           len = STRLEN(buf);
           break;
@@ -372,13 +375,13 @@
           break;
 	case SNMP_ENDOFMIBVIEW:
 -          sprintf(buf,"%s", "ENDOFMIBVIEW");
 +          snprintf(buf, buf_len, "%s", "ENDOFMIBVIEW");
 	  break;
 	case SNMP_NOSUCHOBJECT:
 -	  sprintf(buf,"%s", "NOSUCHOBJECT");
 +	  snprintf(buf, buf_len, "%s", "NOSUCHOBJECT");
 	  break;
 	case SNMP_NOSUCHINSTANCE:
 -	  sprintf(buf,"%s", "NOSUCHINSTANCE");
 +	  snprintf(buf, buf_len, "%s", "NOSUCHINSTANCE");
 	  break;
         case ASN_COUNTER64:
@@ -398,18 +401,18 @@
 #endif
         case ASN_BIT_STR:
 -            snprint_bitstring(buf, sizeof(buf), var, NULL, NULL, NULL);
 +            snprint_bitstring(buf, buf_len, var, NULL, NULL, NULL);
             len = STRLEN(buf);
             break;
 #ifdef OPAQUE_SPECIAL_TYPES
         case ASN_OPAQUE_FLOAT:
 	  if (var->val.floatVal)
 -	    sprintf(buf,"%f", *var->val.floatVal);
 +	    snprintf(buf, buf_len, "%f", *var->val.floatVal);
          break;
         case ASN_OPAQUE_DOUBLE:
 	  if (var->val.doubleVal)
 -	    sprintf(buf,"%f", *var->val.doubleVal);
 +	    snprintf(buf, buf_len, "%f", *var->val.doubleVal);
          break;
 #endif
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-clientaddr-fix.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-clientaddr-fix.patch
@ -1,95 +0,0 @@
 Fix clientaddr functionality. Includes further memory leak and newline fixes.
 Previously, the clientaddr option in snmp.conf was parsed, but the actual
 clientaddr was used to bind(), yet sendmsg() was still called with 0.0.0.0.
 This patch alters:
 - netsnmp_udp_fmtaddr: include both sides of addr_pair for debugging.
 - netsnmp_udp_transport: Set addr_pair->local_addr in the remote && client_socket path.
 - netsnmp_udp_transport: Print a debugging error on failure to bind()
 - netsnmp_udp_transport: Print out the full client open addr_pair data.
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 Status: Merged in upstream r16654
 Tracking-URL: https://sourceforge.net/tracker/?func=detail&atid=312694&aid=1775124&group_id=12694
 Further fixes:
 Revision 16681
    add missing newline in debug msg
 Revision 16704
    CHANGES: snmplib: BUG: Coverity #183: fix memory leak if IP_PKTINFO fails
 Revision 16716
    CHANGES: snmplib: Do not leak memory whenever an udp address is formatted.
 Fixes bug: bugs.gentoo.org/180266
 diff -Naur net-snmp-5.4.1.orig/snmplib/snmpUDPDomain.c net-snmp-5.4.1/snmplib/snmpUDPDomain.c
 --- net-snmp-5.4.1.orig/snmplib/snmpUDPDomain.c	2007-06-11 02:15:24.000000000 +0400
 +++ net-snmp-5.4.1/snmplib/snmpUDPDomain.c	2007-12-27 18:15:56.000000000 +0300
@@ -104,11 +104,13 @@
 	char tmp[64];
         to = (struct sockaddr_in *) &(addr_pair->remote_addr);
         if (to == NULL) {
 -            return strdup("UDP: unknown");
 +            sprintf(tmp, "UDP: [%s]->unknown",
 +                    inet_ntoa(addr_pair->local_addr));
 +        } else {
 +            sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr));
 +            sprintf(tmp + strlen(tmp), "[%s]:%hd",
 +                    inet_ntoa(to->sin_addr), ntohs(to->sin_port));
         }
 -
 -        sprintf(tmp, "UDP: [%s]:%hu",
 -                inet_ntoa(to->sin_addr), ntohs(to->sin_port));
         return strdup(tmp);
     }
 }
@@ -642,6 +644,7 @@
             if (setsockopt(t->sock, SOL_IP, IP_PKTINFO, &sockopt, sizeof sockopt) == -1) {
                 DEBUGMSGTL(("netsnmp_udp", "couldn't set IP_PKTINFO: %s\n",
                     strerror(errno)));
 +                netsnmp_transport_free(t);
                 return NULL;
             }
             DEBUGMSGTL(("netsnmp_udp", "set IP_PKTINFO\n"));
@@ -667,10 +670,24 @@
         if (client_socket) {
             struct sockaddr_in client_addr;
             netsnmp_sockaddr_in2(&client_addr, client_socket, NULL);
 +            addr_pair.local_addr = client_addr.sin_addr;
             client_addr.sin_port = 0;
 -            bind(t->sock, (struct sockaddr *)&client_addr,
 +            rc = bind(t->sock, (struct sockaddr *)&client_addr,
                   sizeof(struct sockaddr));
 +            if ( rc != 0 ) {
 +                DEBUGMSGTL(("netsnmp_udp", "failed to bind for clientaddr: %d %s\n",
 +                            errno, strerror(errno)));
 +                netsnmp_udp_close(t);
 +                netsnmp_transport_free(t);
 +                return NULL;
 +            }
         }
 +
 +        str = netsnmp_udp_fmtaddr(NULL, (void *)&addr_pair,
 +                 sizeof(netsnmp_udp_addr_pair));
 +        DEBUGMSGTL(("netsnmp_udp", "client open %s\n", str));
 +        free(str);
 +
         /*
          * Save the (remote) address in the
          * transport-specific data pointer for later use by netsnmp_udp_send.
@@ -839,12 +856,12 @@
                 if (host == NULL) {
                     DEBUGMSGTL(("netsnmp_sockaddr_in",
                                 "servname not numeric, "
 -				"check if it really is a destination)"));
 +				"check if it really is a destination)\n"));
                     host = port;
                     port = NULL;
                 } else {
                     DEBUGMSGTL(("netsnmp_sockaddr_in",
 -                                "servname not numeric"));
 +                                "servname not numeric\n"));
                     free(peername);
                     return 0;
                 }
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch
@ -1,538 +0,0 @@
 r16694 | rstory | 2007-09-14 17:11:59 +0400 (Птн, 14 Сен 2007) | 3 lines
 Apple patches
 - add/fix disk/partition tables on darwin
 Also fixes incorrect hrFSStorageIndex
 http://bugs.gentoo.org/show_bug.cgi?id=211660
 http://sourceforge.net/tracker/index.php?func=detail&aid=1696044&group_id=12694&atid=312694
 --- agent/mibgroup/host/hr_partition.c	(revision 16693)
 +++ agent/mibgroup/host/hr_partition.c	(revision 16694)
@@ -1,8 +1,17 @@
 -
 /*
  *  Host Resources MIB - partition device group implementation - hr_partition.c
  *
  */
 +/* Portions of this file are subject to the following copyright(s).  See
 + * the Net-SNMP's COPYING file for more details and other copyrights
 + * that may apply:
 + */
 +/*
 + * Portions of this file are copyrighted by:
 + * Copyright (C) 2007 Apple, Inc. All rights reserved.
 + * Use is subject to license terms specified in the COPYING file
 + * distributed with the Net-SNMP package.
 + */
 #include <net-snmp/net-snmp-config.h>
 #include <fcntl.h>
@@ -35,6 +44,9 @@
 static int      HRP_savedDiskIndex;
 static int      HRP_savedPartIndex;
 static char     HRP_savedName[1024];
 +#ifdef NETSNMP_CAN_GET_DISK_LABEL
 +static char     HRP_savedLabel[1024];
 +#endif
 static int      HRP_DiskIndex;
@@ -135,6 +147,7 @@
             (name[HRPART_DISK_NAME_LENGTH] &
              ((1 << HRDEV_TYPE_SHIFT) - 1));
 +        DEBUGMSGTL(("host/hr_partition", "... low index %d\n", LowDiskIndex));
         while (HRP_DiskIndex < LowDiskIndex) {
             Init_HR_Partition();        /* moves to next disk */
             if (HRP_DiskIndex == -1)
@@ -144,6 +157,7 @@
     for (;;) {
         part_idx = Get_Next_HR_Partition();
 +        DEBUGMSGTL(("host/hr_partition", "... part index %d\n", part_idx));
         if (part_idx == 0)
             break;
         newname[HRPART_DISK_NAME_LENGTH] =
@@ -225,8 +239,13 @@
         long_return = part_idx;
         return (u_char *) & long_return;
     case HRPART_LABEL:
 +#ifdef NETSNMP_CAN_GET_DISK_LABEL
 +        *var_len = strlen(HRP_savedLabel);
 +        return (u_char *) HRP_savedLabel;
 +#else
         *var_len = strlen(HRP_savedName);
         return (u_char *) HRP_savedName;
 +#endif
     case HRPART_ID:            /* Use the device number */
         sprintf(string, "0x%x", (int) stat_buf.st_rdev);
         *var_len = strlen(string);
@@ -259,9 +278,11 @@
 static void
 Init_HR_Partition(void)
 {
 +    DEBUGMSGTL(("host/hr_partition", "Init_HR_Partition\n"));
     HRP_DiskIndex = Get_Next_HR_Disk();
     if (HRP_DiskIndex != -1)
         HRP_DiskIndex &= ((1 << HRDEV_TYPE_SHIFT) - 1);
 +    DEBUGMSGTL(("host/hr_partition", "...  %d\n",HRP_DiskIndex));
     HRP_index = -1;
 }
@@ -272,6 +293,7 @@
     char            string[1024];
     int             fd;
 +    DEBUGMSGTL(("host/hr_partition", "Get_Next_HR_Partition %d\n",HRP_DiskIndex));
     if (HRP_DiskIndex == -1) {
         return 0;
     }
@@ -309,4 +331,7 @@
     HRP_savedDiskIndex = disk_idx;
     HRP_savedPartIndex = part_idx;
     (void) Get_Next_HR_Disk_Partition(HRP_savedName, sizeof(HRP_savedName), HRP_index);
 +#ifdef NETSNMP_CAN_GET_DISK_LABEL
 +    (void) Get_HR_Disk_Label(HRP_savedLabel, sizeof(HRP_savedLabel), HRP_savedName);
 +#endif
 }
 Index: agent/mibgroup/host/hr_filesys.c
 ===================================================================
 --- agent/mibgroup/host/hr_filesys.c	(revision 16693)
 +++ agent/mibgroup/host/hr_filesys.c	(revision 16694)
@@ -2,11 +2,25 @@
  *  Host Resources MIB - File System device group implementation - hr_filesys.c
  *
  */
 +/* Portions of this file are subject to the following copyright(s).  See
 + * the Net-SNMP's COPYING file for more details and other copyrights
 + * that may apply:
 + */
 +/*
 + * Portions of this file are copyrighted by:
 + * Copyright (C) 2007 Apple, Inc. All rights reserved.
 + * Use is subject to license terms specified in the COPYING file
 + * distributed with the Net-SNMP package.
 + */
 #include <net-snmp/net-snmp-config.h>
 +#include <net-snmp/net-snmp-includes.h>
 +#include <net-snmp/agent/net-snmp-agent-includes.h>
 +#include <net-snmp/agent/hardware/memory.h>
 #include "host_res.h"
 #include "hr_filesys.h"
 #include "hr_storage.h"
 +#include "hr_disk.h"
 #include <net-snmp/utilities.h>
 #if HAVE_MNTENT_H
@@ -535,7 +549,7 @@
             long_return = 2;    /* others probably aren't */
         return (u_char *) & long_return;
     case HRFSYS_STOREIDX:
 -        long_return = fsys_idx + HRS_TYPE_FIXED_MAX;
 +        long_return = fsys_idx + NETSNMP_MEM_TYPE_MAX;
         return (u_char *) & long_return;
     case HRFSYS_FULLDUMP:
         return when_dumped(HRFS_entry->HRFS_name, FULL_DUMP, var_len);
 Index: agent/mibgroup/host/hr_disk.c
 ===================================================================
 --- agent/mibgroup/host/hr_disk.c	(revision 16693)
 +++ agent/mibgroup/host/hr_disk.c	(revision 16694)
@@ -2,6 +2,16 @@
  *  Host Resources MIB - disk device group implementation - hr_disk.c
  *
  */
 +/* Portions of this file are subject to the following copyright(s).  See
 + * the Net-SNMP's COPYING file for more details and other copyrights
 + * that may apply:
 + */
 +/*
 + * Portions of this file are copyrighted by:
 + * Copyright (C) 2007 Apple, Inc. All rights reserved.
 + * Use is subject to license terms specified in the COPYING file
 + * distributed with the Net-SNMP package.
 + */
 #include <net-snmp/net-snmp-config.h>
 #include "host_res.h"
@@ -65,6 +75,15 @@
 #include <limits.h>
 #endif
 +#ifdef darwin
 +#include <CoreFoundation/CoreFoundation.h>
 +#include <IOKit/IOKitLib.h>
 +#include <IOKit/storage/IOBlockStorageDriver.h>
 +#include <IOKit/storage/IOMedia.h>
 +#include <IOKit/IOBSD.h>
 +#include <DiskArbitration/DADisk.h>
 +#endif
 +
 #ifdef linux
 /*
  * define BLKGETSIZE from <linux/fs.h>:
@@ -79,6 +98,27 @@
 #define HRD_MONOTONICALLY_INCREASING
 +/*************************************************************
 + * constants for enums for the MIB node
 + * hrDiskStorageAccess (INTEGER / ASN_INTEGER)
 + */
 +#define HRDISKSTORAGEACCESS_READWRITE  1
 +#define HRDISKSTORAGEACCESS_READONLY  2
 +
 +
 +/*************************************************************
 + * constants for enums for the MIB node
 + * hrDiskStorageMedia (INTEGER / ASN_INTEGER)
 + */
 +#define HRDISKSTORAGEMEDIA_OTHER  1
 +#define HRDISKSTORAGEMEDIA_UNKNOWN  2
 +#define HRDISKSTORAGEMEDIA_HARDDISK  3
 +#define HRDISKSTORAGEMEDIA_FLOPPYDISK  4
 +#define HRDISKSTORAGEMEDIA_OPTICALDISKROM  5
 +#define HRDISKSTORAGEMEDIA_OPTICALDISKWORM  6
 +#define HRDISKSTORAGEMEDIA_OPTICALDISKRW  7
 +#define HRDISKSTORAGEMEDIA_RAMDISK  8
 +
         /*********************
 	 *
 	 *  Kernel & interface information,
@@ -132,6 +172,19 @@
 static struct disklabel HRD_info;
 #endif
 +#ifdef darwin
 +static int64_t  HRD_cap;
 +static int      HRD_access;
 +static int      HRD_type;
 +static int      HRD_removeble;
 +static char     HRD_model[40];
 +static int      HRD_saved_access;
 +static int      HRD_saved_type;
 +static int      HRD_saved_removeble;
 +static int _get_type_from_protocol( const char *prot );
 +static int _get_type_value( const char *str_type );
 +#endif
 +
 static void     parse_disk_config(const char *, char *);
 static void     free_disk_config(void);
@@ -185,6 +238,8 @@
                       "/dev/rdsk/c%dt%dd0s0", 0, 7);
     Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 7, 0, 15,
                       "/dev/rdsk/c%dd%ds0", 0, 7);
 +#elif defined(darwin)
 +    Add_HR_Disk_entry("/dev/disk%ds%d", -1, -1, 0, 32, "/dev/disk%d", 1, 32);
 #elif defined(freebsd4) || defined(freebsd5)
     Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h');
     Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h');
@@ -484,6 +539,7 @@
     Init_HR_Disk();
     for (;;) {
         disk_idx = Get_Next_HR_Disk();
 +        DEBUGMSGTL(("host/hr_disk", "... index %d\n", disk_idx));
         if (disk_idx == -1)
             break;
         newname[HRDISK_ENTRY_NAME_LENGTH] = disk_idx;
@@ -749,7 +805,13 @@
                     HRD_history[iindex] = 0;
                     return ((HRDEV_DISK << HRDEV_TYPE_SHIFT) + iindex);
                 }
 +                DEBUGMSGTL(("host/hr_disk",
 +                            "Get_Next_HR_Disk: can't query %s\n", string));
             }
 +            else {
 +                DEBUGMSGTL(("host/hr_disk",
 +                            "Get_Next_HR_Disk: can't open %s\n", string));
 +            }
             HRD_history[iindex] = now;
             HRD_index++;
         }
@@ -801,6 +863,66 @@
     return 0;
 }
 +#ifdef darwin
 +int
 +Get_HR_Disk_Label(char *string, size_t str_len, const char *devfull)
 +{
 +    DASessionRef        sess_ref;
 +    DADiskRef           disk;
 +    CFDictionaryRef     desc;
 +    CFStringRef         str_ref;
 +    CFStringEncoding    sys_encoding = CFStringGetSystemEncoding();
 +
 +    DEBUGMSGTL(("host/hr_disk", "Disk Label type %s\n", devfull));
 +
 +    sess_ref = DASessionCreate( NULL );
 +    if (NULL == sess_ref) {
 +        strncpy(string, devfull, str_len);
 +        string[str_len-1] = 0;
 +        return -1;
 +    }
 +
 +    disk = DADiskCreateFromBSDName( NULL, sess_ref, devfull );
 +    if (NULL == disk) {
 +        CFRelease(sess_ref);
 +        strncpy(string, devfull, str_len);
 +        string[str_len-1] = 0;
 +        return -1;
 +    }
 +
 +    desc = DADiskCopyDescription( disk );
 +    if (NULL == desc) {
 +        snmp_log(LOG_ERR,
 +                 "diskmgr: couldn't get disk description for %s, skipping\n",
 +                 devfull);
 +        CFRelease(disk);
 +        CFRelease(sess_ref);
 +        strncpy(string, devfull, str_len);
 +        return -1;
 +    }
 +
 +    /** model */
 +    str_ref = (CFStringRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionMediaNameKey);
 +    if (str_ref) {
 +        strncpy(string, CFStringGetCStringPtr(str_ref, sys_encoding),
 +                str_len);
 +        string[str_len-1] = 0;
 +        DEBUGMSGTL(("verbose:diskmgr:darwin", " name %s\n", string));
 +    }
 +    else {
 +        strncpy(string, devfull, str_len);
 +        string[str_len-1] = 0;
 +    }
 +    
 +    CFRelease(disk);
 +    CFRelease(desc);
 +    CFRelease(sess_ref);
 +    
 +    return 0;
 +}
 +#endif
 +
 static void
 Save_HR_Disk_Specific(void)
 {
@@ -822,6 +944,13 @@
 #ifdef DIOCGDINFO
     HRD_savedCapacity = HRD_info.d_secperunit / 2;
 #endif
 +#ifdef darwin
 +    HRD_savedCapacity = HRD_cap / 1024;
 +    HRD_saved_access = HRD_access;
 +    HRD_saved_type = HRD_type;
 +    HRD_saved_removeble = HRD_removeble;
 +#endif
 +
 }
 static void
@@ -845,6 +974,11 @@
                     sizeof(HRD_savedModel)-1);
     HRD_savedModel[ sizeof(HRD_savedModel)-1 ] = 0;
 #endif
 +#ifdef darwin
 +    strncpy(HRD_savedModel, HRD_model,
 +                    sizeof(HRD_savedModel)-1);
 +    HRD_savedModel[ sizeof(HRD_savedModel)-1 ] = 0;
 +#endif
 }
 static const char *
@@ -900,6 +1034,104 @@
     result = ioctl(fd, DIOCGDINFO, &HRD_info);
 #endif
 +#ifdef darwin
 +    DASessionRef        sess_ref;
 +    DADiskRef           disk;
 +    CFDictionaryRef     desc;
 +    CFStringRef         str_ref;
 +    CFNumberRef         number_ref;
 +    CFBooleanRef        bool_ref;
 +    CFStringEncoding    sys_encoding = CFStringGetSystemEncoding();
 +
 +    sess_ref = DASessionCreate( NULL );
 +    if (NULL == sess_ref)
 +        return -1;
 +
 +    disk = DADiskCreateFromBSDName( NULL, sess_ref, devfull );
 +    if (NULL == disk) {
 +        CFRelease(sess_ref);
 +        return -1;
 +    }
 +
 +    desc = DADiskCopyDescription( disk );
 +    if (NULL == desc) {
 +        CFRelease(disk);
 +        CFRelease(sess_ref);
 +        return -1;
 +    }
 +
 +    number_ref = (CFNumberRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionMediaSizeKey);
 +    if (number_ref)
 +        CFNumberGetValue(number_ref, kCFNumberSInt64Type, &HRD_cap);
 +    else
 +        HRD_cap = 0;
 +    DEBUGMSGTL(("verbose:diskmgr:darwin", " size %lld\n", HRD_cap));
 +
 +    /** writable?  */
 +    bool_ref = (CFBooleanRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionMediaWritableKey);
 +    if (bool_ref) {
 +        HRD_access = CFBooleanGetValue(bool_ref);
 +    }
 +    else
 +        HRD_access = 0;
 +    DEBUGMSGTL(("verbose:diskmgr:darwin", " writable %d\n",
 +                HRD_access));
 +
 +    /** removable?  */
 +    bool_ref = (CFBooleanRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionMediaRemovableKey);
 +    if (bool_ref) {
 +        HRD_removeble = CFBooleanGetValue(bool_ref);
 +    }
 +    else
 +        HRD_removeble = 0;
 +    DEBUGMSGTL(("verbose:diskmgr:darwin", " removable %d\n",
 +                HRD_removeble));
 +
 +    /** get type */
 +    str_ref = (CFStringRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionMediaTypeKey);
 +    if (str_ref) {
 +        HRD_type = _get_type_value(CFStringGetCStringPtr(str_ref,
 +                                                         sys_encoding));
 +        DEBUGMSGTL(("verbose:diskmgr:darwin", " type %s / %d\n",
 +                    CFStringGetCStringPtr(str_ref, sys_encoding),
 +                    HRD_type));
 +    }
 +    else {
 +        str_ref = (CFStringRef)
 +            CFDictionaryGetValue(desc, kDADiskDescriptionDeviceProtocolKey);
 +        if (str_ref) {
 +            HRD_type = 
 +                _get_type_from_protocol(CFStringGetCStringPtr(str_ref,
 +                                                              sys_encoding));
 +            DEBUGMSGTL(("verbose:diskmgr:darwin", " type %s / %d\n",
 +                        CFStringGetCStringPtr(str_ref, sys_encoding),
 +                        HRD_type));
 +        }
 +        else
 +            HRD_type = HRDISKSTORAGEMEDIA_UNKNOWN;
 +    }
 +
 +    /** model */
 +    str_ref = (CFStringRef)
 +        CFDictionaryGetValue(desc, kDADiskDescriptionDeviceModelKey);
 +    if (str_ref) {
 +        strncpy(HRD_model, CFStringGetCStringPtr(str_ref, sys_encoding),
 +                sizeof(HRD_model));
 +        HRD_savedModel[ sizeof(HRD_savedModel)-1 ] = 0;
 +        DEBUGMSGTL(("verbose:diskmgr:darwin", " model %s\n", HRD_model));
 +    }
 +    else
 +        HRD_model[0] = 0;
 +    CFRelease(disk);
 +    CFRelease(desc);
 +    CFRelease(sess_ref);
 +    result = 0;
 +#endif
 +
     return (result);
 }
@@ -918,6 +1150,11 @@
         return (2);             /* read only */
 #endif
 +#ifdef darwin
 +    if (!HRD_access)
 +        return (2);
 +#endif
 +
     return (1);                 /* read-write */
 }
@@ -990,6 +1227,9 @@
     }
 #endif
 +#ifdef darwin
 +    return HRD_type;
 +#endif
     return (2);                 /* Unknown */
 }
@@ -1020,5 +1260,63 @@
         return (1);             /* true */
 #endif
 +#ifdef darwin
 +    if (HRD_removeble)
 +        return (1);
 +#endif
 +
     return (2);                 /* false */
 }
 +
 +#ifdef darwin
 +typedef struct type_value_map_s {
 +     const char *type;
 +     uint32_t    value;
 +} type_value_map;
 +
 +static type_value_map media_type_map[] = {
 +    { "CD-ROM", HRDISKSTORAGEMEDIA_OPTICALDISKROM},
 +    { "DVD-R", HRDISKSTORAGEMEDIA_OPTICALDISKWORM},
 +    { "DVD+R", HRDISKSTORAGEMEDIA_OPTICALDISKWORM},
 +};  
 +static int media_types = sizeof(media_type_map)/sizeof(media_type_map[0]);
 +
 +static int
 +_get_type_value( const char *str_type )
 +{
 +    int           i, len;
 +    
 +    if (NULL == str_type)
 +        return HRDISKSTORAGEMEDIA_UNKNOWN;
 +
 +    len = strlen(str_type);
 +    for(i=0; i < media_types; ++i) {
 +        if (0 == strcmp(media_type_map[i].type, str_type))
 +            return media_type_map[i].value;
 +    }
 +
 +    return HRDISKSTORAGEMEDIA_UNKNOWN;
 +}
 +
 +static type_value_map proto_map[] = {
 +    { "ATA", HRDISKSTORAGEMEDIA_HARDDISK},
 +    { "ATAPI", HRDISKSTORAGEMEDIA_OPTICALDISKROM}
 +};
 +static int proto_maps = sizeof(proto_map)/sizeof(proto_map[0]);
 +
 +static int _get_type_from_protocol( const char *prot )
 +{   
 +    int           i, len;
 +
 +    if (NULL == prot)
 +        return TV_FALSE;
 +
 +    len = strlen(prot);
 +    for(i=0; i < proto_maps; ++i) {
 +        if (0 == strcmp(proto_map[i].type, prot))
 +            return proto_map[i].value;
 +    }
 +
 +    return HRDISKSTORAGEMEDIA_UNKNOWN;
 +}
 +#endif
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch
@ -1,134 +0,0 @@
 r16804 | magfr | 2008-02-14 02:37:48 +0300 (Чтв, 14 Фев 2008) | 2 lines
 NEWS: snmplib: Change CONTAINER_INSERT to not do partial inserts in containers with multiple indices when one insert fails.
 http://sourceforge.net/tracker/index.php?func=detail&aid=1733344&group_id=12694&atid=112694
 http://bugs.gentoo.org/show_bug.cgi?id=203127
 Index: snmplib/container.c
 ===================================================================
 --- snmplib/container.c	(revision 16803)
 +++ snmplib/container.c	(revision 16804)
@@ -282,31 +282,41 @@
  * These functions should EXACTLY match the inline version in
  * container.h. If you change one, change them both.
  */
 -int CONTAINER_INSERT(netsnmp_container *x, const void *k)
 -{ 
 -    int rc2, rc = 0;
 -    
 -    /** start at first container */
 -    while(x->prev)
 -        x = x->prev;
 -    for(; x; x = x->next) {
 -        if ((NULL != x->insert_filter) &&
 -            (x->insert_filter(x,k) == 1))
 -            continue;
 -        rc2 = x->insert(x,k);
 -        if (rc2) {
 +int CONTAINER_INSERT_HELPER(netsnmp_container* x, const void* k)
 +{
 +    while(x && x->insert_filter && x->insert_filter(x,k) == 1)
 +        x = x->next;
 +    if(x) {
 +        int rc = x->insert(x,k);
 +        if(rc)
             snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
 -                     x->container_name ? x->container_name : "", rc2);
 -            rc = rc2;
 +                     x->container_name ? x->container_name : "", rc);
 +        else {
 +            rc = CONTAINER_INSERT_HELPER(x->next, k);
 +            if(rc)
 +                x->remove(x,k);
         }
 +        return rc;
     }
 -    return rc;
 +    return 0;
 }
 /*------------------------------------------------------------------
  * These functions should EXACTLY match the inline version in
  * container.h. If you change one, change them both.
  */
 +int CONTAINER_INSERT(netsnmp_container* x, const void* k)
 +{
 +    /** start at first container */
 +    while(x->prev)
 +        x = x->prev;
 +    return CONTAINER_INSERT_HELPER(x, k);
 +}
 +
 +/*------------------------------------------------------------------
 + * These functions should EXACTLY match the inline version in
 + * container.h. If you change one, change them both.
 + */
 int CONTAINER_REMOVE(netsnmp_container *x, const void *k)
 {
     int rc2, rc = 0;
 Index: include/net-snmp/library/container.h
 ===================================================================
 --- include/net-snmp/library/container.h	(revision 16803)
 +++ include/net-snmp/library/container.h	(revision 16804)
@@ -364,32 +364,43 @@
      * container.c. If you change one, change them both.
      */
     NETSNMP_STATIC_INLINE /* gcc docs recommend static w/inline */
 -    int CONTAINER_INSERT(netsnmp_container *x, const void *k)
 +    int CONTAINER_INSERT_HELPER(netsnmp_container* x, const void* k)
     {
 -        int rc2, rc = 0;
 -        
 -        /** start at first container */
 -        while(x->prev)
 -            x = x->prev;
 -        for(; x; x = x->next) {
 -            if ((NULL != x->insert_filter) &&
 -                (x->insert_filter(x,k) == 1))
 -                continue;
 -            rc2 = x->insert(x,k);
 -            if (rc2) {
 +        while(x && x->insert_filter && x->insert_filter(x,k) == 1)
 +            x = x->next;
 +        if(x) {
 +            int rc = x->insert(x,k);
 +            if(rc)
                 snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
 -                         x->container_name ? x->container_name : "", rc2);
 -                rc = rc2;
 +                         x->container_name ? x->container_name : "", rc);
 +            else {
 +                rc = CONTAINER_INSERT_HELPER(x->next, k);
 +                if(rc)
 +                    x->remove(x,k);
             }
 +            return rc;
         }
 -        return rc;
 +        return 0;
     }
 -    
 +
     /*------------------------------------------------------------------
      * These functions should EXACTLY match the function version in
      * container.c. If you change one, change them both.
      */
     NETSNMP_STATIC_INLINE /* gcc docs recommend static w/inline */
 +    int CONTAINER_INSERT(netsnmp_container* x, const void* k)
 +    {
 +        /** start at first container */
 +        while(x->prev)
 +            x = x->prev;
 +        return CONTAINER_INSERT_HELPER(x, k);
 +    }
 +
 +    /*------------------------------------------------------------------
 +     * These functions should EXACTLY match the function version in
 +     * container.c. If you change one, change them both.
 +     */
 +    NETSNMP_STATIC_INLINE /* gcc docs recommend static w/inline */
     int CONTAINER_REMOVE(netsnmp_container *x, const void *k)
     {
         int rc2, rc = 0;
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-perl-asneeded.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-perl-asneeded.patch
@ -1,33 +0,0 @@
 Index: net-snmp-5.4.1/configure.in
 ===================================================================
 --- net-snmp-5.4.1.orig/configure.in
 +++ net-snmp-5.4.1/configure.in
@@ -2,7 +2,7 @@
 # the Net-SNMP's COPYING file for more details and other copyrights
 # that may apply:
 #
 -# Portions Copyright © 2003 Sun Microsystems, Inc. All rights reserved.
 +# Portions Copyright Â© 2003 Sun Microsystems, Inc. All rights reserved.
 # Use is subject to license terms specified in the COPYING file
 # distributed with the Net-SNMP package.
 #
@@ -3097,8 +3097,8 @@ fi
 # check needed functions
 if test "x$embed_perl" != "xno" ; then
 -    OLDLDFLAGS="$LDFLAGS"
 -    LDFLAGS="$LDFLAGS $netsnmp_perlldopts"
 +    OLDLIBS="$LIBS"
 +    LIBS="$LIBS $netsnmp_perlldopts"
     # newer perl vs older perl call functions
     AC_CHECK_FUNCS(eval_pv)
@@ -3109,7 +3109,7 @@ if test "x$embed_perl" != "xno" ; then
     AC_CHECK_FUNC(perl_eval_pv, AC_DEFINE(HAVE_PERL_EVAL_PV_LC))
     AC_CHECK_FUNC(Perl_eval_pv, AC_DEFINE(HAVE_PERL_EVAL_PV_UC))
 -    LDFLAGS="$OLDLDFLAGS"
 +    LIBS="$OLDLIBS"
     if test "x$ac_cv_func_perl_eval_pv" != "xyes" -a "x$ac_cv_func_Perl_eval_pv" != "xyes" -a "x$ac_cv_func_eval_pv" != "xyes" ; then
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-process-count-race.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-process-count-race.patch
@ -1,52 +0,0 @@
 r16705 | tanders | 2007-09-21 01:55:49 +0400 (Птн, 21 Сен 2007) | 3 lines
 CHANGES: snmpd: PATCH: 1746831: from cunnijd: fix process checking race
 condition under Linux and platform #ifdefs
 --- agent/mibgroup/ucd-snmp/proc.c	(revision 16704)
 +++ agent/mibgroup/ucd-snmp/proc.c	(revision 16705)
@@ -427,7 +427,7 @@
     return count;
 }
 -#elif OSTYPE == NETSNMP_LINUXID
 +#elif NETSNMP_OSTYPE == NETSNMP_LINUXID
 #include <dirent.h>
 #include <fcntl.h>
@@ -452,7 +452,7 @@
 #ifdef USE_PROC_CMDLINE  /* old method */
       /* read /proc/XX/cmdline */
       sprintf(cmdline,"/proc/%s/cmdline",ent->d_name);
 -      if((fd = open(cmdline, O_RDONLY)) < 0) break;
 +      if((fd = open(cmdline, O_RDONLY)) < 0) continue;
       len = read(fd,cmdline,sizeof(cmdline) - 1);
       close(fd);
       if(len <= 0) continue;
@@ -464,7 +464,7 @@
       /* read /proc/XX/status */
       sprintf(cmdline,"/proc/%s/status",ent->d_name);
       if ((status = fopen(cmdline, "r")) == NULL)
 -          break;
 +          continue;
       if (fgets(cmdline, sizeof(cmdline), status) == NULL) {
           fclose(status);
           break;
@@ -507,7 +507,7 @@
     return total;
 }
 -#elif OSTYPE == NETSNMP_ULTRIXID
 +#elif NETSNMP_OSTYPE == NETSNMP_ULTRIXID
 #define	NPROCS		32      /* number of proces to read at once */
@@ -688,7 +688,7 @@
         return (0);
     return (1);
 }
 -#elif OSTYPE == NETSNMP_SOLARISID
 +#elif NETSNMP_OSTYPE == NETSNMP_SOLARISID
 #ifdef _SLASH_PROC_METHOD_
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-sensors3-version_detect.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-sensors3-version_detect.patch
@ -1,56 +0,0 @@
 From: Gordon Malm <gengor@gentoo.org>
 Detect lm_sensors version and build accordingly.
 --- a/agent/mibgroup/hardware/sensors.h
 +++ b/agent/mibgroup/hardware/sensors.h
@@ -1,13 +1,21 @@
 config_require(hardware/sensors/hw_sensors)
 #if defined(solaris)
 +
 # if defined(HAVE_PICL_H)
 config_require(hardware/sensors/picld_sensors)
 # else
 config_require(hardware/sensors/kstat_sensors)
 # endif
 +
 #else
 +
 +# if defined(HAVE_LMSENSORS_V2)
 +config_require(hardware/sensors/lmsensors_v2)
 +# else
 config_require(hardware/sensors/lmsensors_v3)
 +# endif
 +
 #endif
 //config_require(hardware/sensors/dummy_sensors)
 --- a/configure.in
 +++ b/configure.in
@@ -1909,6 +1909,25 @@ done
 AC_MSG_RESULT([$new_module_list.])
 +echo " $new_module_list " | $GREP "ucd-snmp/lmsensorsMib" > /dev/null
 +if test $? -eq 0 ; then
 +	case $target_os in
 +		linux*)
 +			AC_CHECK_HEADER(sensors/sensors.h,,[AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])
 +	
 +			AC_MSG_CHECKING([lm_sensors version])
 +			AC_EGREP_CPP(lmsensors_v2,[
 +#include <sensors/sensors.h>
 +#if SENSORS_API_VERSION < 0x400
 +lmsensors_v2
 +#endif
 +			], [AC_DEFINE([HAVE_LMSENSORS_V2], [1], [Define if lm_sensors version 2.x])]
 +			have_lmsensors_ver="2.x", have_lmsensors_ver="3.x or higher")
 +			AC_MSG_RESULT([$have_lmsensors_ver])
 +			;;
 +	esac
 +fi
 +
 #---------------------
 # loop over module list
 #
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-sensors3.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-sensors3.patch
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1-suppresssuppress-annoying.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-suppresssuppress-annoying.patch
@ -1,17 +0,0 @@
 NEWS: agent: suppress annoying "registration != duplicate" warning for root oids
 (otherwise, you'll get this message on almost every startup)
 http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&revision=16669
 --- branches/V5-4-patches/net-snmp/agent/agent_registry.c	2007/08/20 08:06:42	16668
 +++ branches/V5-4-patches/net-snmp/agent/agent_registry.c	2007/08/22 21:56:23	16669
@@ -532,7 +532,8 @@
 	    if (next && (next->namelen  == new_sub->namelen) &&
 		(next->priority == new_sub->priority)) {
 -                netsnmp_assert(!"registration != duplicate"); /* always false */
 +                if (new_sub->namelen != 1) /* ignore root OID dups */
 +                    netsnmp_assert(!"registration != duplicate"); /* always false */
 		return MIB_DUPLICATE_REGISTRATION;
 	    }
--- a/net-analyzer/net-snmp/files/net-snmp-5.4.1.1-rpm5-1.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1.1-rpm5-1.patch
@ -1,59 +0,0 @@
 Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
 Date: 2008-11-04
 Initial Package Version: 5.4.1.1
 Origin: http://wraptastic.org/pub/jbj/rpm514-netsnmp-5.4.1.1.patch
 Upstream Status: unknown
 Description: hack to compile against rpm 5.1
 diff -Naur net-snmp-5.4.1.1.orig/agent/mibgroup/host/hr_swinst.c net-snmp-5.4.1.1/agent/mibgroup/host/hr_swinst.c
 --- net-snmp-5.4.1.1.orig/agent/mibgroup/host/hr_swinst.c	2006-12-12 23:55:46.000000000 +0000
 +++ net-snmp-5.4.1.1/agent/mibgroup/host/hr_swinst.c	2008-11-03 23:19:29.305010591 +0000
@@ -41,8 +41,10 @@
 #endif
 #ifdef HAVE_LIBRPM
 +#include <stdio.h>
 +#include <stdint.h>
 #include <rpm/rpmlib.h>
 -#include <rpm/header.h>
 +#include <rpm/rpm4compat.h>
 #include <fcntl.h>
 #ifdef HAVE_RPMGETPATH
@@ -465,6 +467,7 @@
             if ( headerGetEntry(swi->swi_h, RPMTAG_INSTALLTIME, NULL, (void **) &rpm_data, NULL) ) {
                 time_t          installTime = *rpm_data;
                 ret = date_n_time(&installTime, var_len);
 +		free((void *)rpm_data);
             } else {
                 ret = date_n_time(0, var_len);
             }
@@ -661,6 +664,9 @@
                        NULL);
         snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r);
         swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0;
 +	free((void *)n);
 +	free((void *)v);
 +	free((void *)r);
     }
 #else
     snprintf(swi->swi_name, sizeof(swi->swi_name), swi->swi_dep->d_name);
 diff -Naur net-snmp-5.4.1.1.orig/configure.in net-snmp-5.4.1.1/configure.in
 --- net-snmp-5.4.1.1.orig/configure.in	2008-05-14 00:49:57.000000000 +0000
 +++ net-snmp-5.4.1.1/configure.in	2008-11-03 23:22:44.126003483 +0000
@@ -2760,12 +2760,12 @@
   fi
 ])
 -AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
 +AC_CHECK_HEADERS(rpm/rpmlib.h rpm/rpmtag.h)
 AC_CHECK_HEADER(rpm/rpmlib.h,rpmlib_h=yes,rpmlib_h=no)
 -AC_CHECK_HEADER(rpm/header.h,rpmheader_h=yes,rpmheader_h=no)
 +AC_CHECK_HEADER(rpm/rpmtag.h,rpmtag_h=yes,rpmtag_h=no)
 -if test "x$rpmheader_h" = "xno" -o "x$rpmlib_h" = "xno" ; then
 +if test "x$rpmtag_h" = "xno" -o "x$rpmlib_h" = "xno" ; then
   if test "x$with_rpm" = "xyes" ; then
     AC_MSG_ERROR([Could not find either the RPM header files needed and was specifically asked to use RPM support])
   else
--- a/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch
@ -1,475 +0,0 @@
 diff -Naur net-snmp-5.1.1.old/agent/mibgroup/host/hr_sensor.c net-snmp-5.1.1/agent/mibgroup/host/hr_sensor.c
 --- net-snmp-5.1.1.old/agent/mibgroup/host/hr_sensor.c	1970-01-01 02:00:00.000000000 +0200
 +++ net-snmp-5.1.1/agent/mibgroup/host/hr_sensor.c	2003-10-21 12:49:57.000000000 +0300
@@ -0,0 +1,322 @@
 +/* This file was generated by mib2c and is intended for use as a mib module
 +   for the ucd-snmp snmpd agent. */
 +
 +#include <net-snmp/net-snmp-config.h>
 +
 +#include <stdio.h>
 +#if HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#if HAVE_STRING_H
 +#include <string.h>
 +#else
 +#include <strings.h>
 +#endif
 +
 +#include <getopt.h>
 +#include <errno.h>
 +#include <dlfcn.h>
 +
 +#include "sensors/sensors.h" 
 +#include "sensors/error.h"
 +
 +#include "host_res.h"
 +#include "hr_sensor.h"
 +
 +
 +/* 
 + * hr_sensor_variables_oid:
 + *   this is the top level oid that we want to register under.  This
 + *   is essentially a prefix, with the suffix appearing in the
 + *   variable below.
 + */
 +
 +
 +oid hr_sensor_variables_oid[] = { 1,3,6,1,2,1,25,8 };
 +
 +
 +/* 
 + * variable2 hr_sensor_variables:
 + *   this variable defines function callbacks and type return information 
 + *   for the hr_sensor mib section 
 + */
 +
 +
 +struct variable2 hr_sensor_variables[] = {
 +  /*  magic number        , variable type , ro/rw , callback fn  , L, oidsuffix */
 +#define   HRSENSORMAPPING  2
 +  { HRSENSORMAPPING, ASN_INTEGER   , RONLY , var_hr_sensor, 2, { 1,1 } },
 +#define   HRSENSORNUMBER  3
 +  { HRSENSORNUMBER, ASN_INTEGER   , RONLY , var_hr_sensor, 2, { 1,2 } },
 +#define   HRSENSORNAME    4
 +  { HRSENSORNAME  , ASN_OCTET_STR , RONLY , var_hr_sensor, 2, { 1,3 } },
 +#define   HRSENSORLABEL   5
 +  { HRSENSORLABEL , ASN_OCTET_STR , RONLY , var_hr_sensor, 2, { 1,4 } },
 +#define   HRSENSORVALUE   6
 +  { HRSENSORVALUE , ASN_OCTET_STR , RONLY , var_hr_sensor, 2, { 1,5 } },
 +
 +};
 +/*    (L = length of the oidsuffix) */
 +
 +
 +#define DEFAULT_CONFIG_FILE_NAME "sensors.conf"
 +
 +static char *config_file_name;
 +FILE *config_file;
 +static const char *config_file_path[] = 
 +{ "/etc", "/usr/lib/sensors", "/usr/local/lib/sensors", "/usr/lib",
 +  "/usr/local/lib", ".", 0 };
 +
 +static void open_config_file(void);
 +static int open_this_config_file(char *filename);
 +
 +
 +/* 
 + * functions that are dynamically loaded if the lm_sensors library is 
 + *   installed. 
 + */
 +static int (*sensors_get_label_dl)(sensors_chip_name name, int feature,
 +				char **result);
 +static int (*sensors_init_dl)(FILE *input);
 +static int (*sensors_get_feature_dl)(sensors_chip_name name, int feature,
 +				  double *result);
 +static const sensors_feature_data *(*sensors_get_all_features_dl)
 +     (sensors_chip_name name, int *nr1,int *nr2);
 +static const sensors_chip_name *(*sensors_get_detected_chips_dl)(int *nr);
 +
 +#define CHIPS_MAX 20
 +static sensors_chip_name chips[CHIPS_MAX];
 +static int chips_count=0;
 +static int do_sets;
 +
 +/* This examines global var config_file, and leaves the name there too. 
 +   It also opens config_file. */
 +static void open_config_file(void)
 +{
 +#define MAX_FILENAME_LEN 1024
 +  char *filename;
 +  char buffer[MAX_FILENAME_LEN];
 +  int res,i;
 +
 +  if (config_file_name && !strcmp(config_file_name,"-")) {
 +    config_file = stdin;
 +    return;
 +  } else if (config_file_name && index(config_file_name,'/')) {
 +    if ((res = open_this_config_file(config_file_name))) {
 +      fprintf(stderr,"Could not locate or open config file\n");
 +      fprintf(stderr,"%s: %s\n",config_file_name,strerror(res));
 +      exit(1);
 +    }
 +  }
 +  else {
 +    if (config_file_name)
 +      filename = config_file_name;
 +    else
 +      filename = strdup(DEFAULT_CONFIG_FILE_NAME);
 +    for (i = 0; config_file_path[i]; i++) {
 +      if ((snprintf(buffer,MAX_FILENAME_LEN,
 +		    "%s/%s",config_file_path[i],filename)) < 1) {
 +        fprintf(stderr,
 +                "open_config_file: ridiculous long config file name!\n");
 +        exit(1);
 +      }
 +      if (!open_this_config_file(buffer)) {
 +        free(config_file_name);
 +        config_file_name = strdup(buffer);
 +        return;
 +      }
 +    }
 +    fprintf(stderr,"Could not locate or open config file!\n");
 +    exit(1);
 +  }
 +}
 +    
 +static int open_this_config_file(char *filename)
 +{
 +  config_file = fopen(filename,"r");
 +  if (! config_file)
 +    return -errno;
 +  return 0;
 +}
 +
 +static long *sensor_tbl = 0;
 +sensors_chip_name *chip_tbl = 0;
 +static int sensor_maxnum = 0;
 +
 +static void do_register(sensors_chip_name name)
 +{
 +  const char *algo,*adap;
 +
 +  {
 +    const sensors_feature_data *sensor;
 +    const char *map=0;
 +    int index0 = 0, index1 = 0;
 +    
 +    printf("%s\n", name);
 +
 +    while ((sensor = sensors_get_all_features_dl (name, &index0, &index1))
 +	    != NULL) {
 +      if(sensor_tbl = realloc(sensor_tbl, sizeof(long) * (sensor_maxnum+2)))
 +	sensor_tbl[sensor_maxnum] = sensor->number;
 +      if (chip_tbl = realloc(chip_tbl, sizeof(sensors_chip_name) * (sensor_maxnum+2)))
 +	chip_tbl[sensor_maxnum] = name;
 +      sensor_maxnum++;
 +    }
 +  }
 +}
 +
 +/*
 + * init_hr_sensor():
 + *   Initialization routine.  This is called when the agent starts up.
 + *   At a minimum, registration of your variables should take place here.
 + */
 +void init_hr_sensor(void) {
 +
 +  const sensors_chip_name *chip;
 +  int chip_nr,i;
 +  int c,res;
 +  void *sensors_library;
 +  
 +  /* This could probably due with a bit more error reporting. */
 +  sensors_library=dlopen("libsensors.so",RTLD_LAZY);
 +  if(sensors_library==NULL)
 +    return; // return before anything is registered
 +
 +  sensors_get_label_dl=dlsym(sensors_library,"sensors_get_label");
 +  sensors_init_dl=dlsym(sensors_library,"sensors_init");
 +  sensors_get_feature_dl=dlsym(sensors_library,"sensors_get_feature");
 +  sensors_get_all_features_dl=dlsym(sensors_library,
 +				    "sensors_get_all_features");
 +  sensors_get_detected_chips_dl=dlsym(sensors_library,
 +				      "sensors_get_detected_chips");
 +  if(sensors_get_label_dl==NULL || sensors_init_dl==NULL || 
 +     sensors_get_feature_dl==NULL || sensors_get_all_features_dl==NULL ||
 +     sensors_get_detected_chips_dl==NULL)
 +    return; // return before anything is registered
 +
 +  /* register ourselves with the agent to handle our mib tree */
 +  REGISTER_MIB("hr_sensor", hr_sensor_variables, variable2,
 +               hr_sensor_variables_oid);
 +
 +
 +  /* place any other initialization junk you need here */
 +
 +
 +  chips[0].prefix = SENSORS_CHIP_NAME_PREFIX_ANY;
 +  chips[0].bus = SENSORS_CHIP_NAME_BUS_ANY;
 +  chips[0].addr = SENSORS_CHIP_NAME_ADDR_ANY;
 +  chips_count = 1;
 +
 +  open_config_file();
 +
 +  if ((res = sensors_init_dl(config_file))) {
 +    return;
 +  }
 +
 +  for (chip_nr = 0; (chip = sensors_get_detected_chips_dl(&chip_nr));)
 +    do_register (*chip);
 +}
 +
 +
 +/*
 + * var_hr_sensor():
 + *   This function is called every time the agent gets a request for
 + *   a scalar variable that might be found within your mib section
 + *   registered above.  It is up to you to do the right thing and
 + *   return the correct value.
 + *     You should also correct the value of "var_len" if necessary.
 + *
 + *   Please see the documentation for more information about writing
 + *   module extensions, and check out the examples in the examples
 + *   and mibII directories.
 + */
 +unsigned char *
 +var_hr_sensor(struct variable *vp, 
 +		   oid     *name, 
 +		   size_t  *length, 
 +		   int     exact, 
 +		   size_t  *var_len, 
 +		   WriteMethod **write_method)
 +{
 +  /* variables we may use later */
 +  static long long_ret;
 +  static char *string = 0;
 +  static oid objid[MAX_OID_LEN];
 +  static struct counter64 c64;
 +
 +  const sensors_feature_data *sensor;
 +  const char *map=0;
 +  int index0 = 0, index1 = 0;
 +  int sensor_idx = 0, sensor_num = 0;
 +  sensors_chip_name chip_name;
 +  double value;
 +
 +
 +  if (header_simple_table(vp,name,length,exact,var_len,write_method,sensor_maxnum)
 +      == MATCH_FAILED )
 +    return NULL;
 +
 +   sensor_idx = name[*length - 1] - 1;
 +   sensor_num = sensor_tbl[sensor_idx];
 +   chip_name = chip_tbl[sensor_idx];
 +
 +  while ((sensor = sensors_get_all_features_dl (chip_name, &index0, &index1)) 
 +	  != NULL) {
 +    if(sensor_num == sensor->number) {      
 +      /* 
 +       * this is where we do the value assignments for the mib results.
 +       */
 +      switch(vp->magic) {
 +	
 +	
 +      case HRSENSORMAPPING:
 +        
 +        long_ret = sensor->mapping;
 +        return (unsigned char *) &long_ret;
 +	
 +      case HRSENSORNUMBER:
 +        
 +        long_ret = sensor_num;
 +        return (unsigned char *) &long_ret;
 +	
 +      case HRSENSORNAME:
 +        
 +	string = malloc(SPRINT_MAX_LEN);
 +        strncpy(string, sensor->name, SPRINT_MAX_LEN);
 +        *var_len = strlen(string);
 +        return (unsigned char *) string;
 +	
 +      case HRSENSORLABEL:
 +        
 +	string = malloc(SPRINT_MAX_LEN);
 +
 +	if (sensors_get_label_dl (chip_name, sensor->number, &string)) {
 +	  return 0;
 +	} 
 +	
 +	*var_len = strlen(string);
 +	return (unsigned char *) string;
 +	
 +      case HRSENSORVALUE:
 +	
 +	if (!(sensor->mode & SENSORS_MODE_R)) {
 +	  return 0;
 +	} else if (!(sensor->mode & SENSORS_MODE_R)) {
 +	  return 0;
 +	} else if (sensors_get_feature_dl (chip_name, sensor->number, &value)){
 +	  return 0;
 +	}      
 +	string = malloc(SPRINT_MAX_LEN);
 +	snprintf(string, SPRINT_MAX_LEN, "%f", value);
 +	*var_len = strlen(string);
 +	return (unsigned char *) string;
 +	
 +      default:
 +	ERROR_MSG("");
 +	return NULL;
 +      }
 +    }
 +  }
 +  return NULL;
 +}
 +
 diff -Naur net-snmp-5.1.1.old/agent/mibgroup/host/hr_sensor.h net-snmp-5.1.1/agent/mibgroup/host/hr_sensor.h
 --- net-snmp-5.1.1.old/agent/mibgroup/host/hr_sensor.h	1970-01-01 02:00:00.000000000 +0200
 +++ net-snmp-5.1.1/agent/mibgroup/host/hr_sensor.h	2003-10-21 12:47:04.000000000 +0300
@@ -0,0 +1,24 @@
 +/* This file was generated by mib2c and is intended for use as a mib module
 +  for the ucd-snmp snmpd agent. */
 +
 +
 +#ifndef _MIBGROUP_HRSENSOR_H
 +#define _MIBGROUP_HRSENSOR_H
 +
 +
 +/* we may use header_generic and header_simple_table from the util_funcs module */
 +
 +
 +config_require(util_funcs)
 +
 +
 +/* function prototypes */
 +
 +
 +extern void   init_hr_sensor(void);
 +extern FindVarMethod var_hr_sensor;
 +
 +
 +
 +
 +#endif /* _MIBGROUP_HRSENSOR_H */
 diff -Naur net-snmp-5.1.1.old/agent/mibgroup/host.h net-snmp-5.1.1/agent/mibgroup/host.h
 --- net-snmp-5.1.1.old/agent/mibgroup/host.h	2002-04-20 10:30:00.000000000 +0300
 +++ net-snmp-5.1.1/agent/mibgroup/host.h	2003-10-21 12:47:04.000000000 +0300
@@ -15,6 +15,7 @@
 	config_require(host/hr_filesys)
 	config_require(host/hr_swrun)
 	config_require(host/hr_swinst)
 +	config_require(host/hr_sensor)
 /* add the host resources mib to the default mibs to load */
 config_add_mib(HOST-RESOURCES-MIB)
 diff -Naur net-snmp-5.1.1.old/mibs/HOST-RESOURCES-MIB.txt net-snmp-5.1.1/mibs/HOST-RESOURCES-MIB.txt
 --- net-snmp-5.1.1.old/mibs/HOST-RESOURCES-MIB.txt	2002-04-20 10:30:15.000000000 +0300
 +++ net-snmp-5.1.1/mibs/HOST-RESOURCES-MIB.txt	2003-10-21 12:47:04.000000000 +0300
@@ -106,6 +106,7 @@
 hrSWRunPerf     OBJECT IDENTIFIER ::= { host 5 }
 hrSWInstalled   OBJECT IDENTIFIER ::= { host 6 }
 hrMIBAdminInfo  OBJECT IDENTIFIER ::= { host 7 }
 +hrSensor        OBJECT IDENTIFIER ::= { host 8 }
 -- textual conventions
@@ -1390,6 +1391,66 @@
         (hex)'00 00 01 01 00 00 00 00'."
     ::= { hrSWInstalledEntry 5 }
 +
 +hrSensorEntry OBJECT-TYPE
 +    SYNTAX     hrSensorEntry
 +    MAX-ACCESS not-accessible
 +    STATUS     current
 +    DESCRIPTION
 +        "The CPU temperature sensor settings."
 +    INDEX { hrSensor }
 +    ::= { hrSensor 1 }
 +
 +hrSensorEntry ::= SEQUENCE {
 +        hrSensorNumber     Integer32,
 +        hrSensorMapping    Integer32,
 +        hrSensorName       DisplayString,
 +        hrSensorLabel      DisplayString,
 +        hrSensorValue      DisplayString
 +    }
 +
 +
 +
 +hrSensorMapping OBJECT-TYPE
 +    SYNTAX     Integer32 (1..2147483647)
 +    MAX-ACCESS read-only
 +    STATUS     current
 +    DESCRIPTION
 +        "The mapping"
 +    ::= { hrSensorEntry 1 }
 +
 +hrSensorNumber OBJECT-TYPE
 +    SYNTAX     Integer32 (1..2147483647)
 +    MAX-ACCESS read-only
 +    STATUS     current
 +    DESCRIPTION
 +        "The Number"
 +    ::= { hrSensorEntry 2 }
 +
 +hrSensorName OBJECT-TYPE
 +    SYNTAX     DisplayString
 +    MAX-ACCESS read-only
 +    STATUS     current
 +    DESCRIPTION
 +        "The name of the sensor."
 +    ::= { hrSensorEntry 3 }
 +
 +hrSensorLabel OBJECT-TYPE
 +    SYNTAX     DisplayString
 +    MAX-ACCESS read-only
 +    STATUS     current
 +    DESCRIPTION
 +        "The label of the sensor."
 +    ::= { hrSensorEntry 4 }
 +
 +hrSensorValue OBJECT-TYPE
 +    SYNTAX     DisplayString
 +    MAX-ACCESS read-only
 +    STATUS     current
 +    DESCRIPTION
 +        "The value of the sensor"
 +    ::= { hrSensorEntry 5 }
 +
 -- Conformance information
 hrMIBCompliances OBJECT IDENTIFIER ::= { hrMIBAdminInfo 2 }
@@ -1456,6 +1517,13 @@
               "The Installed Software Group.
               Implementation of this group is at the discretion
               of the implementor."
 +
 +      GROUP hrSensorGroup
 +          DESCRIPTION
 +              "The Sensors Group.
 +              Implementation of this group is at the discretion
 +              of the implementor."
 +
     ::= { hrMIBCompliances 1 }
     hrSystemGroup OBJECT-GROUP
@@ -1537,4 +1605,17 @@
             "The Host Resources Installed Software Group."
         ::= { hrMIBGroups 6 }
 +    hrSensorGroup OBJECT-GROUP
 +         OBJECTS {
 +		 hrSensorEntry,
 +		 hrSensorNumber,
 +		 hrSensorMapping,
 +		 hrSensorName,
 +		 hrSensorLabel,
 +	         hrSensorValue
 +	 }
 +	 STATUS current 
 +	 DESCRIPTION
 +		"The Sensor Resources Group."	
 +         ::= { hrMIBGroups 7 }		
 END
--- a/net-analyzer/net-snmp/files/rpm514-netsnmp-5.4.1.1.patch
+++ b/net-analyzer/net-snmp/files/rpm514-netsnmp-5.4.1.1.patch
@ -1,246 +0,0 @@
 --- net-snmp-5.4.1.1/agent/mibgroup/host/hr_swinst.c.jbj	2008-09-06 09:11:42.000000000 -0400
 +++ net-snmp-5.4.1.1/agent/mibgroup/host/hr_swinst.c	2008-09-06 09:12:11.000000000 -0400
@@ -41,8 +41,10 @@
 #endif
 #ifdef HAVE_LIBRPM
 +#include <stdio.h>
 +#include <stdint.h>
 #include <rpm/rpmlib.h>
 -#include <rpm/header.h>
 +#include <rpm/rpm4compat.h>
 #include <fcntl.h>
 #ifdef HAVE_RPMGETPATH
@@ -465,6 +467,7 @@ var_hrswinst(struct variable * vp,
             if ( headerGetEntry(swi->swi_h, RPMTAG_INSTALLTIME, NULL, (void **) &rpm_data, NULL) ) {
                 time_t          installTime = *rpm_data;
                 ret = date_n_time(&installTime, var_len);
 +		free((void *)rpm_data);
             } else {
                 ret = date_n_time(0, var_len);
             }
@@ -661,6 +664,9 @@ Save_HR_SW_info(int ix)
                        NULL);
         snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r);
         swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0;
 +	free((void *)n);
 +	free((void *)v);
 +	free((void *)r);
     }
 #else
     snprintf(swi->swi_name, sizeof(swi->swi_name), swi->swi_dep->d_name);
 --- net-snmp-5.4.1.1/configure.jbj	2008-09-06 09:10:46.000000000 -0400
 +++ net-snmp-5.4.1.1/configure	2008-09-06 09:14:56.000000000 -0400
@@ -25823,7 +25823,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include NETSNMP_SYSTEM_INCLUDE_FILE
 #include "$srcdir/$mibdir/$i.h"
 _ACEOF
 -    mv conftest.$ac_ext module_tmp_header.h
 +    mv conftest.$ac_ext module_tmp_rpmtag.h
     #---------------------
     # macro: config_belongs_in(ARG)
@@ -25834,7 +25834,7 @@ _ACEOF
     module_type=mib_module
     if test -f $srcdir/$mibdir/$i.h; then
 -      module_type=`$MODULECPP module_tmp_header.h | grep config_belongs_in | sed 's@.*config_belongs_in(\([^)]*\)).*@\1@'`
 +      module_type=`$MODULECPP module_tmp_rpmtag.h | grep config_belongs_in | sed 's@.*config_belongs_in(\([^)]*\)).*@\1@'`
     fi
     if test "x$module_type" = "x" ; then
@@ -25934,7 +25934,7 @@ _ACEOF
       	#
         # check if $i has any conflicts
         #
 -	new_list_excl=`$MODULECPP module_tmp_header.h | grep config_exclude | sed 's/.*config_exclude(\(.*\)).*/\1/'`
 +	new_list_excl=`$MODULECPP module_tmp_rpmtag.h | grep config_exclude | sed 's/.*config_exclude(\(.*\)).*/\1/'`
 	if test "x$new_list_excl" != "x"; then
   if test $module_debug = 1; then
@@ -25980,7 +25980,7 @@ EOF
         # check if $i has any architecture specific requirements
         #
 -        new_list_arch=`$MODULECPP module_tmp_header.h | grep config_arch_require | sed 's/.*config_arch_require( *\([^ ]*\) *, *\([^ ]*\) *).*/\1-xarchx-\2/'`
 +        new_list_arch=`$MODULECPP module_tmp_rpmtag.h | grep config_arch_require | sed 's/.*config_arch_require( *\([^ ]*\) *, *\([^ ]*\) *).*/\1-xarchx-\2/'`
 	if test "x$new_list_arch" != "x"; then
           for j in $new_list_arch
@@ -26011,7 +26011,7 @@ EOF
         #
         # check if $i has any other required modules
         #
 -	new_list="$new_list `$MODULECPP module_tmp_header.h | grep config_require | sed 's/.*config_require(\(.*\)).*/\1/'`"
 +	new_list="$new_list `$MODULECPP module_tmp_rpmtag.h | grep config_require | sed 's/.*config_require(\(.*\)).*/\1/'`"
   if test $module_debug = 1; then
     echo " $i will test: $new_list"
@@ -26072,7 +26072,7 @@ EOF
         #
         # check if $i has any mibs to add
         #
 -	new_mibs=`$MODULECPP module_tmp_header.h | grep config_add_mib | sed 's/.*config_add_mib(\(.*\)).*/\1/'`
 +	new_mibs=`$MODULECPP module_tmp_rpmtag.h | grep config_add_mib | sed 's/.*config_add_mib(\(.*\)).*/\1/'`
 	if test "x$new_mibs" != "x"; then
 	    for j in $new_mibs
 		do
@@ -26113,7 +26113,7 @@ EOF
         #-------------------
         # check for unsupported config_load_mib
         #
 -        if $MODULECPP module_tmp_header.h | grep config_load_mib > /dev/null 2>&1; then
 +        if $MODULECPP module_tmp_rpmtag.h | grep config_load_mib > /dev/null 2>&1; then
           { echo "$as_me:$LINENO: WARNING: mib module error" >&5
 echo "$as_me: WARNING: mib module error" >&2;}
       	  { echo "$as_me:$LINENO: WARNING: mib module \"$i\" uses the \"config_load_mib\" directive, which is no longer supported.  It probably won't work." >&5
@@ -26125,7 +26125,7 @@ echo "$as_me: WARNING: mib module \"$i\"
         #  (generally not used any longer; old auto-load a .conf token)
         #
 -        $MODULECPP module_tmp_header.h | grep config_parse_dot_conf | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
 +        $MODULECPP module_tmp_rpmtag.h | grep config_parse_dot_conf | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
         #---------------------
@@ -26134,7 +26134,7 @@ echo "$as_me: WARNING: mib module \"$i\"
         #
         # check if $i has any errors, or warnings
         #
 -	error=`$MODULECPP module_tmp_header.h | grep config_error | sed 's/.*config_error(\(.*\)).*/\1/'`
 +	error=`$MODULECPP module_tmp_rpmtag.h | grep config_error | sed 's/.*config_error(\(.*\)).*/\1/'`
 	if test "x$error" != "x"; then
           echo
           echo
@@ -26147,7 +26147,7 @@ echo "$as_me: error: $i: *** $error ***"
       	# macro: config_warning(warning text)
       	#  - used to signal a configuration "warning" to be printed to the user
         #
 -	warning=`$MODULECPP module_tmp_header.h | grep config_warning | sed 's/.*config_warning(\(.*\)).*/\1/'`
 +	warning=`$MODULECPP module_tmp_rpmtag.h | grep config_warning | sed 's/.*config_warning(\(.*\)).*/\1/'`
 	if test "x$warning" != "x"; then
           all_warnings="$all_warnings $warning
 "
@@ -26384,7 +26384,7 @@ EOFOCFIN
 done
 # cleanup
 -rm -f module_tmp_header.h
 +rm -f module_tmp_rpmtag.h
 #-------------------
 # build module lists for Makefiles
@@ -28388,8 +28388,7 @@ rm -f conftest.err conftest.$ac_objext \
 fi;
 -
 -for ac_header in rpm/rpmlib.h rpm/header.h
 +for ac_header in rpm/rpmlib.h rpm/rpmtag.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -28684,8 +28683,8 @@ fi
 if test "${ac_cv_header_rpm_header_h+set}" = set; then
 -  echo "$as_me:$LINENO: checking for rpm/header.h" >&5
 -echo $ECHO_N "checking for rpm/header.h... $ECHO_C" >&6
 +  echo "$as_me:$LINENO: checking for rpm/rpmtag.h" >&5
 +echo $ECHO_N "checking for rpm/rpmtag.h... $ECHO_C" >&6
 if test "${ac_cv_header_rpm_header_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -28693,8 +28692,8 @@ echo "$as_me:$LINENO: result: $ac_cv_hea
 echo "${ECHO_T}$ac_cv_header_rpm_header_h" >&6
 else
   # Is the header compilable?
 -echo "$as_me:$LINENO: checking rpm/header.h usability" >&5
 -echo $ECHO_N "checking rpm/header.h usability... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking rpm/rpmtag.h usability" >&5
 +echo $ECHO_N "checking rpm/rpmtag.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28702,7 +28701,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 -#include <rpm/header.h>
 +#include <rpm/rpmtag.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -28738,15 +28737,15 @@ echo "$as_me:$LINENO: result: $ac_header
 echo "${ECHO_T}$ac_header_compiler" >&6
 # Is the header present?
 -echo "$as_me:$LINENO: checking rpm/header.h presence" >&5
 -echo $ECHO_N "checking rpm/header.h presence... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking rpm/rpmtag.h presence" >&5
 +echo $ECHO_N "checking rpm/rpmtag.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 -#include <rpm/header.h>
 +#include <rpm/rpmtag.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -28780,25 +28779,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -echo "$as_me: WARNING: rpm/header.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: rpm/header.h: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: rpm/header.h: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h:     check for missing prerequisite headers?" >&5
 -echo "$as_me: WARNING: rpm/header.h:     check for missing prerequisite headers?" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: see the Autoconf documentation" >&5
 -echo "$as_me: WARNING: rpm/header.h: see the Autoconf documentation" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h:     section \"Present But Cannot Be Compiled\"" >&5
 -echo "$as_me: WARNING: rpm/header.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: rpm/header.h: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: rpm/header.h: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: rpm/header.h: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: rpm/rpmtag.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ---------------------------------------------------- ##
@@ -28809,8 +28808,8 @@ _ASBOX
       sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 -echo "$as_me:$LINENO: checking for rpm/header.h" >&5
 -echo $ECHO_N "checking for rpm/header.h... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking for rpm/rpmtag.h" >&5
 +echo $ECHO_N "checking for rpm/rpmtag.h... $ECHO_C" >&6
 if test "${ac_cv_header_rpm_header_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
--- a/net-analyzer/net-snmp/files/snmpd.conf
+++ b/net-analyzer/net-snmp/files/snmpd.conf
@ -1,17 +0,0 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
 # Initial (empty) options.
 SNMPD_FLAGS=""
 # Enable connection logging.
 #SNMPD_FLAGS="${SNMPD_FLAGS} -a"
 # Enable syslog and disable file log.
 #SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
 # Enable agentx socket as /var/agentx/master
 # *NOTE* Before uncommenting this, make sure
 #        the /var/agentx directory exists.
 #SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
--- a/net-analyzer/net-snmp/files/snmpd.init
+++ b/net-analyzer/net-snmp/files/snmpd.init
@ -1,47 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init,v 1.1 2009/10/16 08:51:05 gengor Exp $
 opts="${opts} reload"
 depend() {
 	use logger
 	need net
 }
 SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
 checkconfig() {
 	if [ ! -e /etc/snmp/snmpd.conf ] ; then
 		eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
 		return 1
 	fi
 }
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
 		-- -p ${SNMPD_PIDFILE} ${SNMPD_FLAGS}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop --quiet --pidfile ${SNMPD_PIDFILE}
 	eend $?
 }
 reload() {
 	checkconfig || return 1
 	if [ ! -f ${SNMPD_PIDFILE} ]; then
 		eerror "Cannot reload configuration, ${SVCNAME} is not running"
 		eend 1
 		return 1
 	fi
 	ebegin "Reloading ${SVCNAME} configuration"
 	kill -HUP $(< ${SNMPD_PIDFILE}) &>/dev/null
 	eend $?
 }
--- a/net-analyzer/net-snmp/files/snmpd.rc7
+++ b/net-analyzer/net-snmp/files/snmpd.rc7
@ -1,30 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.rc7,v 1.1 2006/11/26 21:37:22 cedk Exp $
 depend() {
 	use logger
 	need net
 }
 checkconfig() {
 	if [ ! -e /etc/snmp/snmpd.conf ] ; then
 		eerror "You need an /etc/snmp/snmpd.conf config file to run snmpd"
 		return 1
 	fi
 }
 start() {
 	checkconfig || return 1
 	ebegin "Starting net-snmpd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
 		-- -p /var/run/snmpd.pid ${SNMPD_FLAGS}
 	eend $?
 }
 stop() {
 	ebegin "Stopping net-snmpd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/snmpd.pid
 	eend $?
 }
--- a/net-analyzer/net-snmp/files/snmptrapd.conf
+++ b/net-analyzer/net-snmp/files/snmptrapd.conf
@ -1,16 +0,0 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
 # extra flags to pass to snmptrapd
 SNMPTRAPD_FLAGS=""
 # ignore authentication failure traps
 #SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
 # log messages to specified file
 #SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
 # log messages to syslog with the specified facility
 # where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
 #SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
--- a/net-analyzer/net-snmp/files/snmptrapd.init
+++ b/net-analyzer/net-snmp/files/snmptrapd.init
@ -1,24 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init,v 1.1 2009/10/16 08:51:05 gengor Exp $
 depend() {
 	use logger
 	need net
 }
 SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
 start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --quiet --exec /usr/sbin/snmptrapd \
 		-- -p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop --quiet --pidfile ${SNMPTRAPD_PIDFILE}
 	eend $?
 }
--- a/net-analyzer/net-snmp/files/snmptrapd.rc7
+++ b/net-analyzer/net-snmp/files/snmptrapd.rc7
@ -1,22 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.rc7,v 1.1 2006/11/26 21:37:22 cedk Exp $
 depend() {
 	use logger
 	need net
 }
 start() {
 	ebegin "Starting snmptrapd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/snmptrapd \
 		-- -p /var/run/snmptrapd.pid ${SNMPTRAPD_FLAGS}
 	eend $?
 }
 stop() {
 	ebegin "Stopping snmptrapd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/snmptrapd.pid
 	eend $?
 }
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@ -1,14 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
 	<use>
 		<flag name='diskio'>Enable the use of diskio mibs</flag>
 		<flag name='elf'>Enable the use of elf utils to check uptime on some sytems</flag>
 		<flag name='extensible'>build deprecated extensible mib module (extend is successor)</flag>
 		<flag name='mfd-rewrites'>Use MFD rewrites of mib modules where available</flag>
 		<flag name='rpm'>Enable the rpm snmp probing</flag>
 		<flag name='sendmail'>Enable sendmail statistics monitoring</flag>
 		<flag name='smux'>Enable the smux MIBS module</flag>
 	</use>
 </pkgmetadata>
--- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild
@ -1,204 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.2 2010/05/01 00:20:04 flameeyes Exp $
 EAPI=2
 inherit fixheadtails flag-o-matic perl-module python autotools
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="bzip2 diskio doc elf extensible ipv6 kernel_linux lm_sensors mfd-rewrites minimal perl python rpm selinux sendmail smux ssl tcpd X zlib"
 COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
 		app-arch/rpm
 		dev-libs/popt
 		app-arch/bzip2
 		>=sys-libs/zlib-1.1.4
 	)
 	bzip2? ( app-arch/bzip2 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	elf? ( dev-libs/elfutils )
 	lm_sensors? (
 		kernel_linux? ( sys-apps/lm_sensors )
 	)
 	python? ( dev-python/setuptools )"
 RDEPEND="${COMMON}
 	perl? (
 		X? ( dev-perl/perl-tk )
 		!minimal? ( dev-perl/TermReadKey )
 	)
 	selinux? ( sec-policy/selinux-snmpd )"
 # Dependency on autoconf due to bug #225893
 DEPEND="${COMMON}
 	>=sys-devel/autoconf-2.61-r2
 	>=sys-apps/sed-4
 	doc? ( app-doc/doxygen )"
 src_prepare() {
 	# Fix CVE-2008-6123
 	epatch "${FILESDIR}"/CVE-2008-6123.patch
 	# lm_sensors-3 support
 	if use lm_sensors ; then
 		epatch "${FILESDIR}"/${PN}-5.4.1-sensors3.patch \
 			"${FILESDIR}"/${PN}-5.4.1-sensors3-version_detect.patch
 	fi
 	# fix access violation in make check
 	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
 	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 	if use python ; then
 		python_version
 		PYTHON_MODNAME="netsnmp"
 		PYTHON_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages"
 		sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \
 			die "sed python failed"
 	fi
 	# snmpconf generates config files with proper selinux context
 	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
 	# remove CFLAGS from net-snmp-config script (bug #257622):
 	sed -i -e 's|@CFLAGS@||g' -e 's|@LDFLAGS@||g' \
 		net-snmp-config.in || die "sedding CFLAGS/LDFLAGS failed"
 	use rpm && epatch "${FILESDIR}"/${PN}-5.4.1.1-rpm5-1.patch #202399
 	# Fix version number:
 	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \
 		snmplib/snmp_version.c || die "sedding version failed"
 	eautoreconf
 	ht_fix_all
 }
 src_configure() {
 	strip-flags
 	local mibs="host ucd-snmp/dlmod"
 	use diskio && mibs="${mibs} ucd-snmp/diskio"
 	use extensible && mibs="${mibs} ucd-snmp/extensible"
 	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
 	use sendmail && mibs="${mibs} mibII/mta_sendmail"
 	use smux && mibs="${mibs} smux"
 	local myconf="$(use_enable ipv6) \
 			$(use_enable mfd-rewrites) \
 			$(use_enable perl embedded-perl) \
 			$(use_enable !ssl internal-md5) \
 			$(use_with elf) \
 			$(use_with perl perl-modules) \
 			$(use_with python python-modules) \
 			$(use_with ssl openssl) \
 			$(use_with tcpd libwrap)"
 	if use rpm ; then
 		myconf="${myconf} \
 			--with-rpm \
 			--with-bzip2 \
 			--with-zlib"
 	else
 		myconf="${myconf} \
 			--without-rpm \
 			$(use_with bzip2) \
 			$(use_with zlib)"
 	fi
 	econf \
 		--with-install-prefix="${D}" \
 		--with-sys-location="Unknown" \
 		--with-sys-contact="root@Unknown" \
 		--with-default-snmp-version="3" \
 		--with-mib-modules="${mibs}" \
 		--with-logfile="/var/log/net-snmpd.log" \
 		--with-persistent-directory="/var/lib/net-snmp" \
 		--enable-ucd-snmp-compatibility \
 		--enable-shared \
 		--enable-as-needed \
 		${myconf}
 }
 src_compile() {
 	emake -j1 || die "emake failed"
 	if use doc ; then
 		einfo "Building HTML Documentation"
 		make docsdox || die "failed to build docs"
 	fi
 }
 src_test() {
 	cd testing
 	if ! make test ; then
 		echo
 		einfo "Don't be alarmed if a few tests FAIL."
 		einfo "This could happen for several reasons:"
 		einfo "    - You don't already have a working configuration."
 		einfo "    - Your ethernet interface isn't properly configured."
 		echo
 	fi
 }
 src_install () {
 	# bug #317965
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
 	if use perl ; then
 		fixlocalpod
 		use X || rm -f "${D}"/usr/bin/tkmib
 	else
 		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
 	fi
 	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO || die
 	newdoc EXAMPLE.conf.def EXAMPLE.conf || die
 	use doc && { dohtml docs/html/* || die ; }
 	keepdir /etc/snmp /var/lib/net-snmp
 	newinitd "${FILESDIR}"/snmpd.init snmpd || die
 	newconfd "${FILESDIR}"/snmpd.conf snmpd || die
 	newinitd "${FILESDIR}"/snmptrapd.init snmptrapd || die
 	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
 	# Remove everything not required for an agent.
 	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
 	if use minimal; then
 		elog "USE='minimal' is set. Removing excess/non-minimal components."
 		rm -rf
 		"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,snmpcheck}}
 		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
 		rm -rf "${D}"/usr/bin/{fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
 		find "${D}" -name '*.pl' -exec rm -f '{}' \;
 		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
 	fi
 	# bug 113788, install example config
 	insinto /etc/snmp
 	newins "${S}"/EXAMPLE.conf snmpd.conf.example || die
 }
 pkg_postrm() {
 	use python && python_mod_cleanup
 }
 pkg_postinst() {
 	elog "An example configuration file has been installed in"
 	elog "/etc/snmp/snmpd.conf.example."
 }
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@ -1,4 +0,0 @@
 DIST cifs-utils-4.5.tar.bz2 321737 RMD160 48dcffd41b7a23b388e17992ccaf59d4ab97d1bb SHA1 5f19dd848d330e01ece18889f6d6b93927059296 SHA256 8287996c59609d3042691ae412d289995d63e7eaf561117f0b9a1ba421ecf25b
 EBUILD cifs-utils-4.5.ebuild 1079 RMD160 50a3564f7876fce9f29d7bf8af66bf0d7a060485 SHA1 5b48629d04ce03c7925eac5d6bf3275fcd4a6187 SHA256 33a5247572ece8d2659f5a75abf4b49f977a80a78855c6649450d9087a0250ed
 EBUILD cifs-utils-9999.ebuild 1079 RMD160 50a3564f7876fce9f29d7bf8af66bf0d7a060485 SHA1 5b48629d04ce03c7925eac5d6bf3275fcd4a6187 SHA256 33a5247572ece8d2659f5a75abf4b49f977a80a78855c6649450d9087a0250ed
 MISC metadata.xml 789 RMD160 1e14745b4c08f0fa8d364170c2864151ae5e016a SHA1 3c978a97c021dc2aa896bebc4aa3432dbf6eb636 SHA256 fec8103fdaaa5f77bb4b644275a8e0e001573d8bc3fef56af4337c11b5c8a0b0
--- a/net-fs/cifs-utils/cifs-utils-4.5.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-4.5.ebuild
@ -1,51 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=2
 inherit eutils confutils
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.samba.org/${PN}.git"
 	inherit git autotools
 else
 	SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 fi
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
 HOMEPAGE="http://www.samba.org/linux-cifs/cifs-utils/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ads +caps caps-ng"
 DEPEND="!net-fs/mount-cifs
 	!net-fs/samba-client
 	!<net-fs/samba-3.6
 	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
 	caps? ( sys-libs/libcap )
 	caps-ng? ( sys-libs/libcap-ng )"
 RDEPEND="${DEPEND}"
 pkg_setup() {
 	confutils_use_conflict caps caps-ng
 }
 src_prepare() {
 	if [[ ${PV} == 9999 ]]; then
 		eautoreconf || die "eautoreconf failed"
 	fi
 }
 src_configure() {
 	econf \
 		$(use_enable ads cifsupcall) \
 		$(use_with caps libcap) \
 		$(use_with caps-ng libcap-ng)
 }
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
 }
--- a/net-fs/cifs-utils/cifs-utils-9999.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-9999.ebuild
@ -1,51 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=2
 inherit eutils confutils
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.samba.org/${PN}.git"
 	inherit git autotools
 else
 	SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 fi
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
 HOMEPAGE="http://www.samba.org/linux-cifs/cifs-utils/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ads +caps caps-ng"
 DEPEND="!net-fs/mount-cifs
 	!net-fs/samba-client
 	!<net-fs/samba-3.6
 	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
 	caps? ( sys-libs/libcap )
 	caps-ng? ( sys-libs/libcap-ng )"
 RDEPEND="${DEPEND}"
 pkg_setup() {
 	confutils_use_conflict caps caps-ng
 }
 src_prepare() {
 	if [[ ${PV} == 9999 ]]; then
 		eautoreconf || die "eautoreconf failed"
 	fi
 }
 src_configure() {
 	econf \
 		$(use_enable ads cifsupcall) \
 		$(use_with caps libcap) \
 		$(use_with caps-ng libcap-ng)
 }
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
 }
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@ -1,20 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd></herd>
 <longdescription lang="en">
 The in-kernel CIFS filesystem is generally the preferred method for mounting
 SMB/CIFS shares on Linux. More information on Linux CIFS is available at the
 Linux CIFS VFS site.
 Although not really part of Samba proper, these tools were originally part of
 the Samba package. For several reasons, shipping these tools as part of Samba
 was problematic and it was deemed better to split them off into their own
 package. 
 </longdescription>
 <use>
 	<flag name="ads">Enable Active Directory integration (cifs.upcall)</flag>
 	<flag name="caps-ng">Use Linux capabilities-ng library to control privilege</flag>
 </use>
 </pkgmetadata>
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@ -1,3 +0,0 @@
 AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad
 DIST samba-4.0.0alpha13.tar.gz 8681348 RMD160 522e1754044f0fb1141246c1a37f28f08567d069 SHA1 c6ff1eafba5869e9ea74f046668cf147ce834da8 SHA256 3cf571d6d32e07537f2b315f3976eb5e5ee563af17a12e406d6d3671fc59cf6c
 EBUILD samba-4.0.0_alpha13.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
--- a/net-fs/samba/files/samba4.initd
+++ b/net-fs/samba/files/samba4.initd
@ -1,31 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba4.initd,v 1.1 2010/02/28 16:03:04 patrick Exp $
 opts="reload"
 description="The samba daemon init script"
 description_reload="Reloads the samba daemon"
 depend() {
 	need net
 }
 start() {
 	ebegin "Starting samba"
 	start-stop-daemon --start --exec /usr/sbin/samba
 	eend $?
 }
 stop() {
 	ebegin "Stopping samba"
 	start-stop-daemon --stop --pidfile /var/run/samba/samba.pid
 	eend $?
 }
 reload() {
 	ebegin "Reloading samba"
 	killall -HUP samba
 	eend $?
 }
--- a/net-fs/samba/samba-4.0.0_alpha13.ebuild
+++ b/net-fs/samba/samba-4.0.0_alpha13.ebuild
@ -1,158 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0_alpha11.ebuild,v 1.3 2010/02/28 16:03:03 patrick Exp $
 EAPI="2"
 inherit confutils
 MY_PV="${PV/_alpha/alpha}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Samba Server component"
 HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/samba4/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="caps debug dso gnutls +netapi sqlite threads +client +server +tools +python"
 DEPEND="!net-fs/samba-libs
 	!net-fs/samba-server
 	!net-fs/samba-client
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
 	caps? ( sys-libs/libcap )
 	gnutls? ( net-libs/gnutls )
 	sqlite? ( >=dev-db/sqlite-3 )
 	>=sys-libs/talloc-2.0.1
 	>=sys-libs/tdb-1.2.0
 	=sys-libs/tevent-0.9.8"
 	#=sys-libs/ldb-0.9.10 No release yet
 # See source4/min_versions.m4 for the minimal versions
 RDEPEND="${DEPEND}"
 RESTRICT="mirror"
 S="${WORKDIR}/${MY_P}/source4"
 SBINPROGS=""
 if use server ; then
 	SBINPROGS="${SBINPROGS} bin/samba"
 fi
 if use client ; then
 	SBINPROGS="${SBINPROGS} bin/mount.cifs bin/umount.cifs"
 fi
 BINPROGS=""
 if use client ; then
 	BINPROGS="${BINPROGS} bin/smbclient bin/net bin/nmblookup bin/ntlm_auth"
 fi
 if use server ; then
 	BINPROGS="${BINPROGS} bin/testparm bin/smbtorture"
 fi
 if use tools ; then
 	# Should be in sys-libs/ldb, but there's no ldb release yet
 	BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
 fi
 pkg_setup() {
 	confutils_use_depend_all server python
 }
 src_configure() {
 	# Upstream refuses to make this configurable
 	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
 	econf \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		$(use_enable debug) \
 		--enable-developer \
 		$(use_enable dso) \
 		--disable-external-heimdal \
 		--enable-external-libtalloc \
 		--enable-external-libtdb \
 		--enable-external-libtevent \
 		--disable-external-libldb \
 		--enable-fhs \
 		--enable-largefile \
 		$(use_enable gnutls) \
 		$(use_enable netapi) \
 		--enable-socket-wrapper \
 		--enable-nss-wrapper \
 		--with-modulesdir=/usr/lib/samba/modules \
 		--with-privatedir=/var/lib/samba/private \
 		--with-ntp-signd-socket-dir=/var/run/samba \
 		--with-lockdir=/var/cache/samba \
 		--with-logfilebase=/var/log/samba \
 		--with-piddir=/var/run/samba \
 		--without-included-popt \
 		$(use_with sqlite sqlite3) \
 		$(use_with threads pthreads) \
 		--with-setproctitle \
 		--with-readline
 }
 src_compile() {
 	# compile libs
 	emake basics || die "emake basics failed"
 	emake libraries || die "emake libraries failed"
 	# compile python
 	if use python ; then
 		emake pythonmods || die "emake pythonmods failed"
 	fi
 	# compile binaries tools
 	emake ${BINPROGS} || die "emake BINPROGS failed"
 	emake ${SBINPROGS} || die "emake SBINPROGS failed"
 }
 src_install() {
 	# install libs
 	emake installlib DESTDIR="${D}" || die "emake installib failed"
 	emake installheader DESTDIR="${D}" || die "emake installheader failed"
 	emake installpc DESTDIR="${D}" || die "make installpc failed"
 	# compile python
 	if use python ; then
 		emake installpython DESTDIR="${D}" || die "emake installpython failed"
 	fi
 	# binaries
 	dosbin ${SBINPROGS} || die "installing SBINPROGS failed"
 	dobin ${BINPROGS} || die "installing BINPROGS failed"
 	# install server components
 	if use server ; then
 		# provision scripts
 		insinto /usr/share/${PN}
 		doins -r setup
 		exeinto /usr/share/${PN}/setup
 		doexe setup/{domainlevel,enableaccount,newuser,provision,pwsettings}
 		doexe setup/{setexpiry,setpassword,upgrade_from_s3}
 		# init script
 		newinitd "${FILESDIR}/samba4.initd" samba
 	fi
 }
 src_test() {
 	emake test DESTDIR="${D}" || die "Test failed"
 }
 pkg_postinst() {
 	# Optimize the python modules so they get properly removed
 	python_mod_optimize $(python_get_sitedir)/${PN}
 	# Warn that it's an alpha
 	ewarn "Samba 4 is an alpha and therefore not considered stable. It's only"
 	ewarn "meant to test and experiment and definitely not for production"
 }
 pkg_postrm() {
 	# Clean up the python modules
 	python_mod_cleanup
 }
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@ -1,3 +0,0 @@
 DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff2777 SHA1 a0c7918767f01e79c37d4bd4dc085855c111994b SHA256 f4db42b21138ca9d424409f880dd311faa0f5e60003f5bbb82d6006dcfd61971
 DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81
 EBUILD skype-2.1.0.47.ebuild 2510 RMD160 47768998b127dab92551031f7bce243e0e623fb4 SHA1 a6ea5ff9d564f4147e5445803e797fa2bd0abc2c SHA256 7cb6c64a4af5b5a41f4a9386fd33179c0917aafad010b3432a23bc0aff4d3bff
--- a/net-im/skype/skype-2.1.0.47.ebuild
+++ b/net-im/skype/skype-2.1.0.47.ebuild
@ -1,111 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.72.ebuild,v 1.3 2009/04/14 09:38:40 armin76 Exp $
 EAPI=2
 inherit eutils qt4 pax-utils
 DESCRIPTION="A P2P-VoiceIP client."
 HOMEPAGE="http://www.skype.com/"
 S_P="${PN}_static-${PV}"
 SRC_URI="
 	!qt-static? ( http://download.${PN}.com/linux/${P}.tar.bz2 )
 	qt-static? ( http://download.${PN}.com/linux/${S_P}.tar.bz2 )
 "
 LICENSE="skype-eula"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qt-static"
 RESTRICT="mirror strip"
 DEPEND="media-fonts/freefont-ttf
 	amd64? (
 		>=app-emulation/emul-linux-x86-baselibs-2.1.1
 		app-emulation/emul-linux-x86-compat
 		>=app-emulation/emul-linux-x86-soundlibs-2.4
 		>=app-emulation/emul-linux-x86-xlibs-1.2
 	)
 	x86? (
 		>=media-libs/alsa-lib-1.0.11
 		>=sys-libs/glibc-2.4
 		x11-libs/libXScrnSaver
 		x11-libs/libXv
 		qt-static? (
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libICE
 			x11-libs/libSM
 			x11-libs/libXcursor
 			x11-libs/libXext
 			x11-libs/libXfixes
 			x11-libs/libXi
 			x11-libs/libXinerama
 			x11-libs/libXrandr
 			x11-libs/libXrender
 			x11-libs/libX11
 		)
 		!qt-static? (
 			x11-libs/qt-gui:4[accessibility,dbus]
 			x11-libs/qt-dbus:4
 			x11-libs/libX11
 			x11-libs/libXau
 			x11-libs/libXdmcp
 		)
 	)
 "
 RDEPEND="${DEPEND}"
 QA_EXECSTACK="opt/${PN}/${PN}"
 use qt-static && S="${WORKDIR}/${S_P}"
 src_install() {
 	exeinto /opt/${PN}
 	doexe ${PN} || die
 	fowners root:audio /opt/${PN}/${PN}
 	make_wrapper ${PN} /opt/${PN}/${PN} /opt/${PN} /opt/${PN} /usr/bin
 	insinto /opt/${PN}/sounds
 	doins sounds/*.wav || die
 	if ! use qt-static ; then
 		insinto /etc/dbus-1/system.d
 		doins ${PN}.conf || die
 	fi
 	insinto /opt/${PN}/lang
 	#
 	#There have been some issues were lang is not updated from the .ts files
 	#but if we have qt we can rebuild it
 	#
 	if ! use qt-static ; then
 		lrelease lang/*.ts
 	fi
 	doins lang/*.qm || die
 	insinto /opt/${PN}/avatars
 	doins avatars/*.png || die
 	insinto /opt/${PN}
 	for X in 16 32 48
 	do
 		insinto /usr/share/icons/hicolor/${X}x${X}/apps
 		newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png || die
 	done
 	dodoc README || die
 	# insinto /usr/share/applications/
 	# doins skype.desktop
 	make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony"
 	#Fix for no sound notifications
 	dosym /opt/${PN} /usr/share/${PN}
 	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
 	# doexe skype-callto-handler
 }
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@ -1,497 +0,0 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.101 2009/02/25 20:33:03 maekke Exp $
  25 Feb 2009; Markus Meier <maekke@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  amd64 stable, bug #252576
  25 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  ppc stable, bug #252576
  25 Feb 2009; Raúl Porcel <armin76@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  arm/ia64/s390/sh/x86 stable wrt #252576
  23 Feb 2009; Jeroen Roovers <jer@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  Stable for HPPA (bug #252576).
  23 Feb 2009; Brent Baude <ranger@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  Marking courier-authlib-0.62.2 ppc64 for bug 252576
  23 Feb 2009; Ferris McCormick <fmccor@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  Sparc stable, security Bug #252576.
  23 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
  courier-authlib-0.62.2.ebuild:
  Stable on alpha, bug #252576
 *courier-authlib-0.62.2 (22 Feb 2009)
  22 Feb 2009; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.62.2.ebuild:
  Version bump and removed obsolete sed line.
 *courier-authlib-0.61.1 (16 Dec 2008)
  16 Dec 2008; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.61.1.ebuild:
  Version bump.
 *courier-authlib-0.61.0 (21 Jul 2008)
  21 Jul 2008; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.61.0.ebuild:
  Version bump and simplification of sed commands.
  16 Jul 2008; Luca Longinotti <chtekk@gentoo.org>
  courier-authlib-0.58.ebuild, courier-authlib-0.59.2.ebuild,
  courier-authlib-0.60.2.ebuild, courier-authlib-0.60.2-r1.ebuild,
  courier-authlib-0.60.6.ebuild:
  Dep on PostgreSQL libs only.
  22 Jun 2008; Markus Meier <maekke@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  amd64 stable, bug #225407
  17 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  stable x86, security bug 225407
  17 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  don't execute tests when USE=berkdb is disabled
  15 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  Don't install libltdl in any case, replace the installable macro with the
  convenience one.
  14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  Don't run eautoreconf twice (first recursive and then non-recursive), as
  it would also have deleted elibtoolize results.
  11 Jun 2008; Raúl Porcel <armin76@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  alpha/ia64/sparc stable wrt #225407
  10 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  ppc stable, bug #225407
  10 Jun 2008; Brent Baude <ranger@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  Marking courier-authlib-0.60.6 ppc64 for bug 225407
  10 Jun 2008; Jeroen Roovers <jer@gentoo.org>
  courier-authlib-0.60.6.ebuild:
  Stable for HPPA (bug #225407).
 *courier-authlib-0.60.6 (08 Jun 2008)
  08 Jun 2008; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.60.6.ebuild:
  Version bump, security.
  25 May 2008; Hanno Boeck <hanno@gentoo.org> courier-authlib-0.60.2.ebuild,
  courier-authlib-0.60.2-r1.ebuild:
  Fix license (GPL-3).
  23 May 2008; Raúl Porcel <armin76@gentoo.org>
  courier-authlib-0.60.2-r1.ebuild:
  ia64 stable wrt #222737
  22 May 2008; Markus Meier <maekke@gentoo.org>
  courier-authlib-0.60.2-r1.ebuild:
  amd64/x86 stable, bug #222737
  22 May 2008; Tobias Klausmann <klausman@gentoo.org>
  courier-authlib-0.60.2-r1.ebuild:
  Stable on alpha, bug #222737
  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
  courier-authlib-0.58.ebuild, courier-authlib-0.59.2.ebuild,
  courier-authlib-0.60.2.ebuild, courier-authlib-0.60.2-r1.ebuild:
  Changed dependency for postgresql from dev-db/postgresql to
  virtual/postgresql-server
  21 May 2008; nixnut <nixnut@gentoo.org> courier-authlib-0.60.2-r1.ebuild:
  Stable on ppc wrt bug 222737
  20 May 2008; Jeroen Roovers <jer@gentoo.org>
  courier-authlib-0.60.2-r1.ebuild:
  Stable for HPPA (bug #222737).
 *courier-authlib-0.60.2-r1 (20 May 2008)
  20 May 2008; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.60.2-r1.ebuild:
  Remove vpopmail-support.
  18 May 2008; Ferris McCormick <fmccor@gentoo.org>
  courier-authlib-0.60.2.ebuild:
  Sparc stable --- Bug #222737 --- builds, installs, works for me.
  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
  courier-authlib-0.60.2.ebuild:
  Run autotools in all directories, not just the toplevel #218295.
  16 Apr 2008; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
  Update metadata, assign this solely to the herd, I'm no longer interested
  in maintaining it myself.
 *courier-authlib-0.60.2 (15 Apr 2008)
  15 Apr 2008; Hanno Boeck <hanno@gentoo.org>
  +courier-authlib-0.60.2.ebuild:
  Version bump, proxy-maintained ebuild by user Bernd Wurst.
  09 Mar 2008; <ricmm@gentoo.org> courier-authlib-0.58.ebuild:
  Drop to ~mips due to unstable deps
  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
  courier-authlib-0.58.ebuild:
  (QA) RESTRICT clean up.
  08 May 2007; Marius Mauch <genone@gentoo.org> courier-authlib-0.58.ebuild,
  courier-authlib-0.59.2.ebuild:
  Replacing einfo with elog
  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
  Update metadata.
 *courier-authlib-0.59.2 (08 Apr 2007)
  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
  -files/0.59.1-configure-db4.patch,
  -files/0.59.1-remove-obsolete-macro.patch,
  +files/0.59.2-configure-db4.patch,
  +files/0.59.2-remove-obsolete-macro.patch, files/courier-authlib,
  -files/initd/courier-authlib, metadata.xml, courier-authlib-0.58.ebuild,
  -courier-authlib-0.58-r1.ebuild, -courier-authlib-0.59.1.ebuild,
  +courier-authlib-0.59.2.ebuild:
  Ebuild cleanup, version bump to 0.59.2.
  30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
  courier-authlib-0.59.1.ebuild:
  Add ~x86-fbsd keyword
 *courier-authlib-0.59.1 (03 Feb 2007)
  03 Feb 2007; Charlie Shepherd <masterdriverz@gentoo.org>
  +files/0.59.1-configure-db4.patch,
  +files/0.59.1-remove-obsolete-macro.patch, +courier-authlib-0.59.1.ebuild:
  Bump to version, bug 162531, thanks to Conrad Kostecki. Add a vpopmail use
  flag, bug 161754, thanks to Georgi Georgiev.
 *courier-authlib-0.58-r1 (16 Jan 2007)
  16 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
  +files/0.58-configure-db4.patch, +files/0.58-remove-obsolete-macro.patch,
  -files/configure-db4.patch, -files/CVE-2005-3532.patch,
  +files/courier-authlib, -files/courier-authlib-initd,
  +files/initd/courier-authlib, -courier-authlib-0.53.ebuild,
  -courier-authlib-0.54.20050224.ebuild, -courier-authlib-0.55.ebuild,
  -courier-authlib-0.55.20050320.ebuild, -courier-authlib-0.56.ebuild,
  -courier-authlib-0.57.ebuild, -courier-authlib-0.57-r1.ebuild,
  -courier-authlib-0.57-r2.ebuild, -courier-authlib-0.57.20051116.ebuild,
  courier-authlib-0.58.ebuild, +courier-authlib-0.58-r1.ebuild:
  Clean out old versions. Sanitize remaining ebuild. Bump to -r1 for bug 117290.
  Fix configure for bug 117290 for >db-4.3, thanks to Hanno Meyer-Thurow. Fix
  configure for bug 160286, thanks to Sheldon Hearn.
  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
  courier-authlib-0.53.ebuild, courier-authlib-0.54.20050224.ebuild,
  courier-authlib-0.55.ebuild, courier-authlib-0.55.20050320.ebuild,
  courier-authlib-0.56.ebuild, courier-authlib-0.57.ebuild,
  courier-authlib-0.57-r1.ebuild, courier-authlib-0.57-r2.ebuild,
  courier-authlib-0.57.20051116.ebuild:
  Remove gnuconfig_update usage, leave it to econf.
  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
  courier-authlib-0.58.ebuild:
  Fix broken autotools handling.
  23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
  courier-authlib-0.53.ebuild, courier-authlib-0.54.20050224.ebuild,
  courier-authlib-0.55.ebuild, courier-authlib-0.55.20050320.ebuild,
  courier-authlib-0.56.ebuild, courier-authlib-0.57.ebuild,
  courier-authlib-0.57-r1.ebuild, courier-authlib-0.57-r2.ebuild,
  courier-authlib-0.57.20051116.ebuild, courier-authlib-0.58.ebuild:
  dev-db/mysql => virtual/mysql
  14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
  Remove swtaylor from metadata.xml due to retiring.
  24 Apr 2006; Joshua Kinard <kumba@gentoo.org> courier-authlib-0.58.ebuild:
  Marked stable on mips.
  02 Apr 2006; Jason Wever <weeve@gentoo.org> courier-authlib-0.58.ebuild:
  Stable on SPARC.
  07 Feb 2006; Simon Stelling <blubb@gentoo.org>
  courier-authlib-0.58.ebuild:
  stable on amd64
  07 Feb 2006; Aron Griffis <agriffis@gentoo.org>
  courier-authlib-0.58.ebuild:
  Mark 0.58 stable on alpha
  21 Jan 2006; Markus Rothe <corsair@gentoo.org>
  courier-authlib-0.58.ebuild:
  Stable on ppc64
  21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
  courier-authlib-0.58.ebuild:
  Stable on ppc.
  17 Jan 2006; Paul Varner <fuzzyray@gentoo.org>
  courier-authlib-0.58.ebuild:
  Stable on x86. Bug #119055
 *courier-authlib-0.58 (10 Dec 2005)
  10 Dec 2005; Scott Taylor <staylor@gentoo.org>
  files/courier-authlib-initd, +courier-authlib-0.58.ebuild:
  add 0.58 ebuild, update init script to export params, for bug 111672
 *courier-authlib-0.57.20051116 (06 Dec 2005)
 *courier-authlib-0.57-r2 (06 Dec 2005)
  06 Dec 2005; Scott Taylor <staylor@gentoo.org> +files/CVE-2005-3532.patch,
  +courier-authlib-0.57-r2.ebuild, +courier-authlib-0.57.20051116.ebuild:
  patch for Bug 113074
  27 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on hppa.
  12 Nov 2005; Jason Wever <weeve@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on SPARC.
  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Mark 0.57-r1 stable on alpha
  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on ppc.
  02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Mark 0.57-r1 stable on ia64
  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on sh.
  24 Sep 2005; Markus Rothe <corsair@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on ppc64
  21 Sep 2005; Francesco Riosa <vivo@gentoo.org>
  courier-authlib-0.57-r1.ebuild:
  Stable on "x86" and "amd64"
 *courier-authlib-0.57-r1 (24 Aug 2005)
  24 Aug 2005; Roy Marples <uberlord@gentoo.org>
  files/courier-authlib-initd, +courier-authlib-0.57-r1.ebuild:
  Rev bump for new init script. Fixes #103104
 *courier-authlib-0.57 (26 Jul 2005)
  26 Jul 2005; Francesco Riosa <vivo@gentoo.org>
  +courier-authlib-0.57.ebuild:
  version bump
  fix Bug #88415 : courier-authlib-0.5* doesn't compile using mysql when 
                   LDFLAGS are set in system
 *courier-authlib-0.56 (02 Jul 2005)
  02 Jul 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.56.ebuild:
  bump
  29 May 2005; <solar@gentoo.org> courier-authlib-0.53.ebuild,
  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.20050320.ebuild,
  courier-authlib-0.55.ebuild:
  - update courier-authlib to use libc expanded variable elibc_uclibc vs uclibc
  so USE=-* works
 *courier-authlib-0.55.20050320 (21 Mar 2005)
  21 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  -courier-authlib-0.54.ebuild, +courier-authlib-0.55.20050320.ebuild:
  bump
  20 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.53.ebuild, courier-authlib-0.55.ebuild:
  promote 0.55, strip -fomit-frame-pointer
  19 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
  bash cleanup
  17 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
  install mysql readme file for pgsql users
  15 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  -courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild,
  courier-authlib-0.54.ebuild, courier-authlib-0.54.20050224.ebuild,
  courier-authlib-0.55.ebuild:
  change vpopmail detection for #85391
 *courier-authlib-0.55 (04 Mar 2005)
  04 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.55.ebuild:
  bump
 *courier-authlib-0.54.20050224 (25 Feb 2005)
  25 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.54.20050224.ebuild:
  bump. adds cram-sha256
 *courier-authlib-0.54 (13 Feb 2005)
  13 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.54.ebuild:
  errata bump
  04 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
  files/courier-authlib-initd:
  add "provide authdaemond" to init script
  31 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
  changed sed calls for more consistent edits.
  make sure userdb is found and migrated
  call makeuserdb after the install, if userdb exists
  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
  mostly cosmetic changes. also puts authldap.schema in /etc/openldap/schema/
  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.52-r1.ebuild:
  initial stable keywording
 *courier-authlib-0.53 (30 Jan 2005)
  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.53.ebuild:
  bump to 0.53
 *courier-authlib-0.52-r1 (07 Jan 2005)
  07 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.52-r1.ebuild:
  build authshadow (bug 71909) and use /usr/$(get_libdir) for better arch support
  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
  courier-authlib-0.52.ebuild:
  multilib and cross-compilation fixes.
  01 Jan 2005; Tuan Van <langthang@gentoo.org> courier-authlib-0.52.ebuild:
  add "libtoolize --copy --force"
  01 Jan 2005; Tuan Van <langthang@gentoo.org> files/configure-db4.patch:
  adjust patch for the newer version.
 *courier-authlib-0.52 (01 Jan 2005)
  01 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
  -courier-authlib-0.51_pre.ebuild, +courier-authlib-0.52.ebuild:
  courier-authlib 0.52 released
  24 Dec 2004; Markus Rothe <corsair@gentoo.org>
  courier-authlib-0.51_pre.ebuild:
  Added ~ppc64 to KEYWORDS; bug #75450
  22 Dec 2004; Tuan Van <langthang@gentoo.org>
  courier-authlib-0.51_pre.ebuild:
  arm/hppa/ia64/s390 keywords on behalf of vapier.
  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.50.20041203.ebuild:
  change keepdir in the other one too
  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.51_pre.ebuild:
  keep more specific dir, and one that doesn't collide with courier
  10 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  -courier-authlib-0.50.20041120.ebuild,
  -courier-authlib-0.50.20041129.ebuild:
  housecleaning
  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.51_pre.ebuild:
  don't mirror release candidate
 *courier-authlib-0.51_pre (09 Dec 2004)
  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.51_pre.ebuild:
  bump
 *courier-authlib-0.50.20041203 (04 Dec 2004)
  04 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.50.20041203.ebuild:
  bump
  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.50.20041129.ebuild:
  ~mips
  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  -courier-authlib-0.50.20041116.ebuild,
  courier-authlib-0.50.20041129.ebuild:
  also check /etc/courier-imap folder for auth*rc configs to migrate
 *courier-authlib-0.50.20041129 (01 Dec 2004)
  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.50.20041129.ebuild:
  bump. fix migration from self
  27 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
  files/courier-authlib-initd, courier-authlib-0.50.20041120.ebuild:
  almost there
  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
  courier-authlib-0.50.20041120.ebuild:
  fix postgres
  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
  files/courier-authlib-initd:
  fix initd
 *courier-authlib-0.50.20041120 (21 Nov 2004)
  21 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
  +courier-authlib-0.50.20041120.ebuild:
  version bump. work in progress.
  20 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
  +files/configure-db4.patch, courier-authlib-0.50.20041116.ebuild:
  work in progress. merging stuff from imap
 *courier-authlib-0.50.20041116 (19 Nov 2004)
  19 Nov 2004; Scott W Taylor <swtaylor@gentoo.org> +metadata.xml,
  +courier-authlib-0.50.20041116.ebuild:
  work in progress
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@ -1,7 +0,0 @@
 AUX 0.59.2-configure-db4.patch 2618 RMD160 33691117802c3a9fe75c75c69594a4f63f4d2575 SHA1 47fc3ba36441c79fa4d8188530a4a2e1a9c8dcd2 SHA256 a60e2f5d26673be2ae107d9fcec024f41c522663d28f4741000fb1885ce067bc
 AUX 0.59.2-remove-obsolete-macro.patch 254 RMD160 268c175e0e75893661c9d17a36265a008469d49d SHA1 1afe4d21d480ab71d58a60cfca03d0a5abef2a3b SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f
 AUX courier-authlib 1112 RMD160 a0d5bf781ed1792677d83efd5034c83f689f7f2f SHA1 e755e781157787c921ef4884c1aca27e0ec68e87 SHA256 c946e42e5ed31a210da99af4d83cb739e2008ad2ea524955cdb141f4c7289dc9
 DIST courier-authlib-0.62.2.tar.bz2 2233216 RMD160 c0f4f32994056f8034f30055cfe55238d137a2ca SHA1 dc495ad6c54c271483d4862e09788621d86629a9 SHA256 8ce756df57c7f4c09219fe9c70b4f7e6002a2e0fbf9de73f304c22b316387c50
 EBUILD courier-authlib-0.62.2.ebuild 5918 RMD160 a44967051ede70be85a83b2c9c83c2e1b114c379 SHA1 1320394dda79fed6368702281817dad25d754b08 SHA256 100d3bbc139f44b9912bc4a1ba55b13e303a68cf2e585e81f87f0efbcefc1206
 MISC ChangeLog 16694 RMD160 d9549d1668f45cc41133296460a9df9b9a1cfaa9 SHA1 db6f6182005a853762c0c2b68d388efd7b6f67b6 SHA256 c6b9c40fac127291b14fdf208061faf37f5fdfdf004f576748a8ca289b8b03ad
 MISC metadata.xml 237 RMD160 09f434a348f9d766c58ac464743d6c55f4d6d4ac SHA1 fceb032c3f94eb505cfcaa1fdb9c0162eb205912 SHA256 a8a93d896577309c559cb95967fe0ebab7ee7201a1c7204eeae6e95ce9375305
--- a/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild
@ -1,190 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.62.2.ebuild,v 1.8 2009/02/25 20:33:03 maekke Exp $
 inherit eutils flag-o-matic autotools libtool
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 DESCRIPTION="Courier authentication library."
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
 RESTRICT="userpriv
 	!berkdb? ( test )"
 RDEPEND="gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db )"
 DEPEND="${RDEPEND}
 		>=dev-libs/openssl-0.9.6
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		pam? ( virtual/pam )
 		postgres? ( virtual/postgresql-base )"
 pkg_setup() {
 	enewuser mail -1 -1 /var/spool/mail
 	if ! has_version 'dev-tcltk/expect' ; then
 		ewarn 'The dev-tcltk/expect package is not installed.'
 		ewarn 'Without it, you will not be able to change system login passwords.'
 		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
 		ewarn 'and others) will work just fine.'
 	fi
 	if use vpopmail ; then
 		eerror
 		eerror "vpopmail support has been removed, it's unmaintained upstream and will be"
 		eerror "removed with the next release."
 		eerror
 		eerror "Please remove vpopmail USE-flag."
 		die "vpopmail support removed"
 	fi
 }
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	if ! use gdbm ; then
 		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
 	else
 		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
 	fi
 	sed -i -e'/for dir in/a\\t\t/etc/courier-imap \\' authmigrate.in || die "sed failed"
 	sed -i -e'/for dir in/a\\t\t/etc/courier/authlib \\' authmigrate.in || die "sed failed"
 	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
 	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
 		|| die "fixing libltdl call failed"
 	local d
 	for d in $(find -name configure.in) ; do
 		[[ ${d} == */libltdl/* ]] && continue
 		cd "${S}"/${d%configure.in}
 		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
 	done
 	elibtoolize
 }
 src_compile() {
 	filter-flags -fomit-frame-pointer
 	local myconf=""
 	myconf="${myconf} `use_with pam authpam`"
 	myconf="${myconf} `use_with ldap authldap`"
 	if use berkdb ; then
 		if use gdbm ; then
 			ewarn "Both gdbm and berkdb selected. Using gdbm."
 		else
 			myconf="${myconf} --with-db=db"
 		fi
 	fi
 	use gdbm && myconf="${myconf} --with-db=gdbm"
 	myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
 	use debug && myconf="${myconf} debug=true"
 	einfo "Configuring courier-authlib: ${myconf}"
 	econf \
 		--sysconfdir=/etc/courier \
 		--datadir=/usr/share/courier \
 		--libexecdir=/usr/$(get_libdir)/courier \
 		--localstatedir=/var/lib/courier \
 		--sharedstatedir=/var/lib/courier/com \
 		--with-authdaemonvar=/var/lib/courier/authdaemon \
 		--with-authshadow \
 		--without-redhat \
 		--with-mailuser=mail \
 		--with-mailgroup=mail \
 		--cache-file="${S}/configuring.cache" \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }
 orderfirst() {
 	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
 	if [[ -e "${file}" ]] ; then
 		orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
 		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
 		sed -i -e "s/^${option}=.*$/${new}/" "${file}"
 	fi
 }
 finduserdb() {
 	for dir in \
 		/etc/courier/authlib /etc/courier /etc/courier-imap \
 		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
 		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
 		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
 		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
 		if [[ -e "${dir}/userdb" ]] ; then
 			einfo "Found userdb at: ${dir}/userdb"
 			cp -f "${dir}/userdb" "${D}/etc/courier/authlib/"
 			chmod go-rwx "${D}/etc/courier/authlib/userdb"
 			continue
 		fi
 	done
 }
 src_install() {
 	diropts -o mail -g mail
 	dodir /etc/courier
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
 	emake DESTDIR="${D}" install || die "emake install failed"
 	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
 	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
 	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
 	rm -f "${D}"/etc/courier/authlib/*.bak
 	chown mail:mail "${D}"/etc/courier/authlib/*
 	for y in "${D}"/etc/courier/authlib/*.dist ; do
 		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
 	done
 	use pam && orderfirst authdaemonrc authmodulelist authpam
 	use ldap && orderfirst authdaemonrc authmodulelist authldap
 	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
 	use mysql && orderfirst authdaemonrc authmodulelist authmysql
 	dodoc AUTHORS ChangeLog* INSTALL NEWS README
 	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
 	if use mysql ; then
 		dodoc README.authmysql.myownquery
 		dohtml README.authmysql.html
 	fi
 	if use postgres ; then
 		dohtml README.authpostgres.html README.authmysql.html
 	fi
 	if use ldap ; then
 		dodoc README.ldap
 		dodir /etc/openldap/schema
 		cp -f authldap.schema "${D}/etc/openldap/schema/"
 	fi
 	doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
 }
 pkg_postinst() {
 	if [[ -e /etc/courier/authlib/userdb ]] ; then
 		einfo "Running makeuserdb ..."
 		chmod go-rwx /etc/courier/authlib/userdb
 		makeuserdb
 	fi
 	# Suggest cleaning out the following old files
 	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
 	if [[ ! -z "${list}" ]] ; then
 		ewarn "Courier authentication files are now in /etc/courier/authlib/"
 		elog "The following files are no longer needed and can likely be removed:"
 		elog " rm $(echo \"${list}\")"
 	fi
 }
--- a/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
+++ b/net-libs/courier-authlib/files/0.59.2-configure-db4.patch
@ -1,68 +0,0 @@
 --- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
 +++ configure.in	2007-02-03 19:52:48.000000000 +0000
@@ -22,7 +22,6 @@
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 -AC_PROG_SYSCONFTOOL
 AC_LIBLTDL_INSTALLABLE
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
@@ -264,15 +263,17 @@
 if test "$db" != "gdbm"
 then
 -	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
 -		[ AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
 -		[ AC_CHECK_LIB(db, db_env_create,
 -			[ LIBDB=-ldb; LIBS="-ldb $LIBS"]) ]
 -			)])
 -
 -	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
 -	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
 -	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
 +  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
 +    do
 + AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +    AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +      AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +        AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
 +    done
 +  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
 +  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
 +  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
 +  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
 fi
 LIBS="$saveLIBS"
 --- bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
 +++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
@@ -21,15 +21,19 @@
 dnl Checks for libraries.
 saveLIBS="$LIBS"
 -AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
 -	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
 -	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
 -	))
 -
 -FOUND_DB=0
 -AC_CHECK_FUNC(dbopen, FOUND_DB=1)
 -AC_CHECK_FUNC(db_open, FOUND_DB=1)
 -AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
 +for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
 +  do
 +        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
 +              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
 +
 +  done
 +FOUND_DB=0
 +AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
 +AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
 +AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
 +AC_CHECK_FUNC(db_create, FOUND_DB=1)
 LIBS="$saveLIBS"
--- a/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
+++ b/net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch
@ -1,10 +0,0 @@
 --- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
 +++ configure.in	2007-02-03 19:58:19.000000000 +0000
@@ -22,7 +22,6 @@
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 -AC_PROG_SYSCONFTOOL
 AC_LIBLTDL_INSTALLABLE
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
--- a/net-libs/courier-authlib/files/courier-authlib
+++ b/net-libs/courier-authlib/files/courier-authlib
@ -1,41 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.2 2007/04/08 14:10:55 chtekk Exp $
 depend() {
 	need net
 	provide authdaemond
 }
 checkconfig() {
 	if [[ ! -e /etc/courier/authlib/authdaemonrc ]] ; then
 		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
 		return 1
 	fi
 }
 setauth() {
 	source /etc/courier/authlib/authdaemonrc
 	AUTHLIB="/usr/lib/courier/courier-authlib"
 	AUTHDAEMOND="authdaemond"
 	pidfile="/var/run/authdaemon.pid"
 	logger="/usr/sbin/courierlogger"
 	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
 }
 start() {
 	checkconfig || return 1
 	setauth
 	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
 		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
 	eend $?
 }
 stop() {
 	setauth
 	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
 	eend $?
 }
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>net-mail</herd>
  <use>
    <flag name="vpopmail">Enable vpopmail support</flag>
  </use>
 </pkgmetadata>
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@ -1,170 +0,0 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.15 2008/10/26 15:32:03 jokey Exp $
 *webkit-gtk-0_p37894 (26 Oct 2008)
  26 Oct 2008; Markus Ullmann <jokey@gentoo.org>
  +webkit-gtk-0_p37894.ebuild:
  Version bump
 *webkit-gtk-0_p36403 (14 Sep 2008)
  14 Sep 2008; Markus Ullmann <jokey@gentoo.org>
  -webkit-gtk-0_p35913.ebuild, +webkit-gtk-0_p36403.ebuild:
  Version bump
  06 Sep 2008; Markus Ullmann <jokey@gentoo.org> ChangeLog:
  Port from dev overlay
 *webkit-gtk-0_p36113 (06 Sep 2008)
  06 Sep 2008; Markus Ullmann <jokey@gentoo.org>
  -webkit-gtk-0_p35024.ebuild, -webkit-gtk-0_p35417.ebuild,
  -webkit-gtk-0_p36013.ebuild, +webkit-gtk-0_p36113.ebuild:
  Version bump
 *webkit-gtk-0_p36013 (01 Sep 2008)
  01 Sep 2008; Markus Ullmann <jokey@gentoo.org>
  +webkit-gtk-0_p36013.ebuild:
  Version bump
 *webkit-gtk-0_p35913 (25 Aug 2008)
  25 Aug 2008; Markus Ullmann <jokey@gentoo.org>
  -webkit-gtk-0_p34753.ebuild, +webkit-gtk-0_p35913.ebuild:
  Version bump and fix dependency for bug #235560 thanks to Jan Kuemmel for
  testing and reporting
  31 Jul 2008; Raúl Porcel <armin76@gentoo.org> webkit-gtk-0_p35417.ebuild:
  Add ~alpha/~ia64/-sparc
  30 Jul 2008; Markus Ullmann <jokey@gentoo.org> webkit-gtk-0_p35417.ebuild:
  drop hildon from IUSE
 *webkit-gtk-0_p35417 (30 Jul 2008)
  30 Jul 2008; Markus Ullmann <jokey@gentoo.org>
  -webkit-gtk-0_p34382.ebuild, -webkit-gtk-0_p34469.ebuild,
  +webkit-gtk-0_p35417.ebuild:
  Version bump, drop hildon use flag as there's no ebuild for that framework
  yet, bug #229021 for reference. Thanks to Brian Johnson
 *webkit-gtk-0_p35024 (06 Jul 2008)
  06 Jul 2008; Hanno Boeck <hanno@gentoo.org> +webkit-gtk-0_p35024.ebuild:
  Version bump.
 *webkit-gtk-0_p34753 (25 Jun 2008)
  25 Jun 2008; Markus Ullmann <jokey@gentoo.org>
  +webkit-gtk-0_p34753.ebuild:
  Version bump
  11 Jun 2008; Markus Ullmann <jokey@gentoo.org> ChangeLog:
  Fix Header
 *webkit-gtk-0_p34469 (11 Jun 2008)
  11 Jun 2008; Markus Ullmann <jokey@gentoo.org>
  +webkit-gtk-0_p34469.ebuild:
  Version bump with fixed ebuild, thanks to Joonas Henriksson in bug #225551
 *webkit-gtk-0_p34382 (08 Jun 2008)
  08 Jun 2008; Markus Ullmann <jokey@gentoo.org> +metadata.xml,
  +webkit-gtk-0_p34382.ebuild:
  Rename to webkit-gtk as per consent on gentoo-dev irc channel
  08 Jun 2008; Markus Ullmann <jokey@gentoo.org> webkitgtk-34382.ebuild:
  actually add the improved ebuild
 *webkitgtk-34382 (08 Jun 2008)
  08 Jun 2008; Markus Ullmann <jokey@gentoo.org> +metadata.xml,
  +webkitgtk-34382.ebuild:
  Initial import from sunrise overlay
  07 Jun 2008; Markus Ullmann <jokey@gentoo.org> -webkitgtk-34192.ebuild,
  +webkitgtk-34382.ebuild:
  Version bump
  06 Jun 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
  -webkitgtk-33431.ebuild:
  Drop old version
  29 May 2008; Markus Ullmann <jokey@gentoo.org> +webkitgtk-34192.ebuild:
  Version bump
  16 May 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
  -webkitgtk-31787.ebuild:
  Drop old version
  14 May 2008; Markus Ullmann <jokey@gentoo.org> +webkitgtk-33431.ebuild:
  Version bump
  11 Apr 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  -webkitgtk-31623.ebuild, +webkitgtk-31787.ebuild:
  Version bump. USE svg only enable svg-experimental
  05 Apr 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  webkitgtk-31623.ebuild:
  Bug 190347. Add ~ppc keyword.
  05 Apr 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  -webkitgtk-31535.ebuild, +webkitgtk-31623.ebuild:
  Bump version. Add SVG options for getting Acid3 to 100%
  03 Apr 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  -webkitgtk-31370.ebuild, webkitgtk-31535.ebuild:
  Fix SVG compilation
  02 Apr 2008; Markus Ullmann <jokey@gentoo.org> +webkitgtk-31535.ebuild:
  Version bump
  27 Mar 2008; Markus Ullmann <jokey@gentoo.org> -webkitgtk-31275.ebuild,
  +webkitgtk-31370.ebuild:
  Version bump per hanno's request
  25 Mar 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  -webkitgtk-31224.ebuild:
  Removed old r31224.
  25 Mar 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com> ++:
  Bug 190347. Updated ebuild for nightly build r31275
  22 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
  -webkitgtk-30468.ebuild, +webkitgtk-31224.ebuild:
  Version bump.
  23 Feb 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com> 
  webkitgtk-30468.ebuild, -webkitgtk-30267.ebuild:
  Bug 190347. New ebuild for WebKit r30468 nightly build.
  15 Feb 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com> 
  +webkitgtk-30267.ebuild, -webkitgtk-29487.ebuild:
  New ebuild for new nightly build
  18 Jan 2008; (Tommy[D]) tommy100@gmx.de webkitgtk-29487.ebuild:
  Reorder KEYWORDS
  16 Jan 2008; (Tommy[D]) tommy100@gmx.de -webkitgtk-29438.ebuild:
  Drop old one
  15 Jan 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  +webkitgtk-29487.ebuild:
  New EBuild. Remove automake --add-missing since bug 205606
  13 Jan 2008; Jakub Moc <jakub@gentoo.org> -webkitgtk-29336.ebuild,
  webkitgtk-29438.ebuild:
  Nuke old and add a comment on bad autotools usage
  13 Jan 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
  +webkitgtk-29438.ebuild:
  New EBuild for r29438 nightly build
  09 Jan 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com> +metadata.xml,
  +webkitgtk-29336.ebuild:
  New EBuild for bug 190347 thanks to Joonas, Dale, genstef and helch
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@ -1,5 +0,0 @@
 AUX fix-bison-incompatibility.patch 463 RMD160 ccb254b83c8e8105d287a02fcc02ce4486a11fe5 SHA1 199718d1ec90d74677b3ccf11270526ebdc9a4a3 SHA256 20dd519515beddc17d208f2c3c3b8e8224bf16c1bbe5133e8f8b947fcb2806cf
 DIST WebKit-r37894.tar.bz2 9615117 RMD160 516a1542ed963b8faacdd36e629a61dcfa364851 SHA1 9663de5937d89629d6e928a91d355c60d3ea8314 SHA256 94fdb7c4bae6d06c3dedcbd8fe9c2135132bf2cc78e936212fb4c537f8e7d0b5
 EBUILD webkit-gtk-0_p37894.ebuild 1817 RMD160 1d6536d21b1109847b8139ec40af978422ad9b25 SHA1 fd53b51f54debd46680e69e8c45e2e26b7633753 SHA256 ddba0e16caa72d4468d53046a54c9e9e23384124d2e9fa61e4784b0f0ed7c817
 MISC ChangeLog 5485 RMD160 e7b7c6cebc227de42bd45fb32c0fa6b42675ae9a SHA1 b26edd8da55966fbc800ed6e7c9104f705e7dc0e SHA256 c6e16197bc0e8e8213309ef48f574824f8212b1ae326fcbe419bedf6cab7dd4f
 MISC metadata.xml 533 RMD160 ff61aeef26bfef5b2f6ba6de2ad8c4c55548e84b SHA1 6b47fbec6901f23ec311ec2bd5b6e62c996b406c SHA256 c38f1b44c497e5dc6fc4d33cab656255fee3a0f705624d59f7058c7ad43304ff
--- a/net-libs/webkit-gtk/files/fix-bison-incompatibility.patch
+++ b/net-libs/webkit-gtk/files/fix-bison-incompatibility.patch
@ -1,22 +0,0 @@
 diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
 index 9ee9c93..9d0a0c6 100644
 --- a/WebCore/css/CSSGrammar.y
 +++ b/WebCore/css/CSSGrammar.y
@@ -94,6 +94,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
 %expect 49
 +%nonassoc LOWEST_PREC
 +
 %left UNIMPORTANT_TOK
 %token WHITESPACE SGML_CD
@@ -349,7 +351,7 @@ maybe_charset:
 closing_brace:
     '}'
 -  | %prec maybe_sgml TOKEN_EOF
 +  | %prec LOWEST_PREC TOKEN_EOF
   ;
 charset:
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>no-herd</herd>
  <maintainer>
    <email>jokey@gentoo.org</email>
    <name>Markus Ullmann</name>
  </maintainer>
  <use>
    <flag name="coverage">enable code coverage support</flag>
    <flag name="pango">Use pango as fontbackend instead of freetype</flag>
    <flag name="soup">Use SOUP as backend instead of curl</flag>
    <flag name="xslt">enable support for XSLT</flag>
  </use>
 </pkgmetadata>
--- a/net-libs/webkit-gtk/webkit-gtk-0_p37894.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-0_p37894.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p37894.ebuild,v 1.1 2008/10/26 15:32:03 jokey Exp $
 inherit autotools
 MY_P="WebKit-r${PV/0\_p}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkit.org/"
 SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="coverage debug gstreamer pango soup sqlite svg xslt"
 RDEPEND=">=x11-libs/gtk+-2.8
 	>=dev-libs/icu-3.8.1-r1
 	>=net-misc/curl-7.15
 	media-libs/jpeg
 	media-libs/libpng
 	dev-libs/libxml2
 	sqlite? ( >=dev-db/sqlite-3 )
 	gstreamer? (
 		>=media-libs/gst-plugins-base-0.10
 		>=gnome-base/gnome-vfs-2.0
 		)
 	soup? ( >=net-libs/libsoup-2.23.1 )
 	xslt? ( dev-libs/libxslt )
 	pango? ( x11-libs/pango )"
 DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	virtual/perl-Text-Balanced"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/fix-bison-incompatibility.patch
 	eautoreconf
 }
 src_compile() {
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 	local myconf
 		use pango && myconf="${myconf} --with-font-backend=pango"
 		use soup && myconf="${myconf} --with-http-backend=soup"
 	econf \
 		$(use_enable sqlite database) \
 		$(use_enable sqlite icon-database) \
 		$(use_enable sqlite dom-storage) \
 		$(use_enable sqlite offline-web-applications) \
 		$(use_enable gstreamer video) \
 		$(use_enable svg) \
 		$(use_enable debug) \
 		$(use_enable xslt) \
 		$(use_enable coverage) \
 		${myconf} \
 		|| die "configure failed"
 	emake || die "emake failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 }
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@ -1,873 +0,0 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.168 2008/12/22 20:03:44 armin76 Exp $
  22 Dec 2008; Raúl Porcel <armin76@gentoo.org>
  courier-imap-4.0.6-r3.ebuild:
  alpha/arm/ia64/sparc stable wrt #168196
  18 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
  courier-imap-4.0.6-r3.ebuild:
  ppc stable, bug #168196
  17 Dec 2008; Markus Meier <maekke@gentoo.org>
  courier-imap-4.0.6-r3.ebuild:
  amd64/x86 stable, bug #168196
  16 Dec 2008; Brent Baude <ranger@gentoo.org> courier-imap-4.0.6-r3.ebuild:
  Marking courier-imap-4.0.6-r3 ppc64 for bug 168196
  16 Dec 2008; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.6-r3.ebuild:
  Stable for HPPA (bug #168196).
 *courier-imap-4.4.1-r1 (14 Dec 2008)
 *courier-imap-4.1.2-r2 (14 Dec 2008)
 *courier-imap-4.0.6-r3 (14 Dec 2008)
  14 Dec 2008; Matti Bickel <mabi@gentoo.org>
  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
  +courier-imap-4.0.6-r3.ebuild, +courier-imap-4.1.2-r2.ebuild,
  +courier-imap-4.4.1-r1.ebuild:
  fixed bug #168196
 *courier-imap-4.4.1 (29 Jul 2008)
  29 Jul 2008; Patrick McLean <chutz@gentoo.org> metadata.xml,
  +courier-imap-4.4.1.ebuild:
  Version bump (bug #183434), allow eautoreconf to be recursive (bug
  #226127). Take over maintainership.
  16 Jul 2008; Luca Longinotti <chtekk@gentoo.org>
  courier-imap-3.0.8.ebuild:
  Dep on PostgreSQL libs only.
  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
  courier-imap-3.0.8.ebuild:
  Changed dependency for postgresql from dev-db/postgresql to
  virtual/postgresql-server
  17 Mar 2008; <ricmm@gentoo.org> courier-imap-3.0.8.ebuild,
  courier-imap-4.0.1.ebuild, courier-imap-4.0.4.ebuild:
  Drop to ~mips due to unstable deps
  15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> courier-imap-3.0.8.ebuild,
  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
  courier-imap-4.0.6-r2.ebuild, courier-imap-4.1.2-r1.ebuild:
  Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug
  #198633
  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
  courier-imap-3.0.8.ebuild, courier-imap-4.0.1.ebuild,
  courier-imap-4.0.1-r1.ebuild, courier-imap-4.0.1-r2.ebuild,
  courier-imap-4.0.4.ebuild:
  (QA) RESTRICT clean up.
  12 Jun 2007; Marius Mauch <genone@gentoo.org> courier-imap-3.0.8.ebuild,
  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
  courier-imap-4.0.6-r2.ebuild, courier-imap-4.1.2-r1.ebuild:
  Replacing einfo with elog
  12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  Stable on alpha as per bug #168196
  11 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  ppc stable, bug #168196
  10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  Stable on sparc wrt security #168196
  09 Apr 2007; Raúl Porcel <armin76@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  ia64 stable wrt security bug 168196
  08 Apr 2007; Markus Rothe <corsair@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  Stable on ppc64; bug #168196
  07 Apr 2007; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.6-r2.ebuild:
  Stable for HPPA (bug #168196).
  07 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
  courier-imap-4.0.6-r2.ebuild:
  stable x86, security bug 168196
  07 Apr 2007; Peter Weller <welp@gentoo.org> courier-imap-4.0.6-r2.ebuild:
  Stable on amd64 wrt bug 168196
 *courier-imap-4.1.2-r1 (07 Apr 2007)
 *courier-imap-4.0.6-r2 (07 Apr 2007)
  07 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
  -files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
  -files/courier-imap-3.0.7-db4-configure.in.patch,
  -files/courier-imap-3.0.7-disable-fam-configure.in.patch,
  +files/courier-imap-4.0.6-aclocal-fix.patch,
  files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
  files/courier-imap-4.0.6-db4-configure.in.patch,
  files/courier-imap-4.0.6-r1-courier-imapd.indirect,
  files/courier-imap-4.0.6-r1-courier-imapd.rc6,
  files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
  files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
  files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
  files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
  files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
  files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
  files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
  files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
  -files/courier-imap-4.1.2-aclocal-fix.patch,
  -files/courier-imap-4.1.2-db4-configure.in.patch, metadata.xml,
  -courier-imap-3.0.7.ebuild, -courier-imap-4.0.6.ebuild,
  -courier-imap-4.0.6-r1.ebuild, +courier-imap-4.0.6-r2.ebuild,
  -courier-imap-4.1.2.ebuild, +courier-imap-4.1.2-r1.ebuild:
  Remove old/unused versions with redundant/unstable keywords. General ebuild
  cleanup for 4.0.6-r2 and 4.1.2-r1. Cleanup of init-scripts and patches. Fix
  security bug #168196 and autotools handling bug #160037.
  30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
  courier-imap-4.1.2.ebuild:
  Add ~x86-fbsd keyword
  01 Mar 2007; Patrick McLean <chutzpah@gentoo.org>
  +files/courier-imap-4.1.2-as-needed.patch, courier-imap-4.1.2.ebuild:
  Add patch to fix compilation with -as-needed (bug #168769)
  27 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
  +files/courier-imap-4.1.2-aclocal-fix.patch,
  +files/courier-imap-4.1.2-db4-configure.in.patch,
  courier-imap-4.1.2.ebuild:
  Add patch to remove AC_PROG_SYSCONFTOOL from configure.in, move patch out of
  -db4-configure.in.patch (fixes bug #168206).
  25 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
  +files/courier-imap-4.0.6-db4-tcpd_configure.in.patch,
  courier-imap-4.1.2.ebuild:
  Restore ChangeLog to previous state before it was killed by blubb. Add patch
  that was previously left out. fixes bug 168190.
 *courier-imap-4.1.2 (23 Feb 2007)
  23 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
  +courier-imap-4.1.2.ebuild:
  Version bump, ebuild contributions by Hanno Meyer-Thurow <h.mth@web.de>,
  Conrad Kostecki <ConiKost@gmx.de>, "Nicola" <n.murino@theorematica.it> and
  James Colannino <james@colannino.org>. Fixes bugs 124985 and 160037.
 *courier-imap-4.0.6-r1 (03 Feb 2007)
  03 Feb 2007; Simon Stelling <blubb@gentoo.org>
  +files/courier-imap-4.0.6-r1-courier-imapd.indirect,
  +files/courier-imap-4.0.6-r1-courier-imapd.rc6,
  +files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
  +files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
  +files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
  +files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
  +files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
  +files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
  +files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,
  +files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
  +courier-imap-4.0.6-r1.ebuild:
  fix bug 141775
  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
  courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild,
  courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild,
  courier-imap-4.0.6.ebuild:
  Remove gnuconfig_update usage, leave it to econf.
  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> courier-imap-3.0.7.ebuild,
  courier-imap-3.0.8.ebuild:
  dev-db/mysql => virtual/mysql
  28 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-4.0.6.ebuild:
  Bug #144651, fix spelling and typos.
  15 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
  +files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
  +files/courier-imap-4.0.6-db4-configure.in.patch,
  courier-imap-4.0.6.ebuild:
  Fix bug #134943 - compile failure with newer versions of berkdb.
  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.4.ebuild:
  Marked stable on mips.
  25 Aug 2006; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-4.0.4.ebuild, courier-imap-4.0.6.ebuild:
  Add chown fixup to avoid some user weirdness of perms 600 on a directory.
  18 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
  courier-imap-4.0.4.ebuild:
  ppc stable, bug #143830
  18 Aug 2006; Joshua Jackson <tsunam@gentoo.org> courier-imap-4.0.4.ebuild:
  Stable x86; bug #143830
  17 Aug 2006; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.4.ebuild:
  stable on amd64
  17 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
  courier-imap-4.0.4.ebuild:
  Stable on alpha wrt bug #143830.
  15 Aug 2006; Jason Wever <weeve@gentoo.org> courier-imap-4.0.4.ebuild:
  Stabgle on SPARC wrt bug #143830.
  14 Aug 2006; Jeroen Roovers <jer@gentoo.org> courier-imap-4.0.4.ebuild:
  Stable for HPPA (bug #143830).
  14 Aug 2006; Brent Baude <ranger@gentoo.org> courier-imap-4.0.4.ebuild:
  Marking courier-imap-4.0.4 ppc64 wrt bug #143830
  07 Aug 2006; Aron Griffis <agriffis@gentoo.org> courier-imap-4.0.4.ebuild:
  Mark 4.0.4 stable on ia64
 *courier-imap-4.0.6 (07 Aug 2006)
  07 Aug 2006; Aron Griffis <agriffis@gentoo.org>
  +courier-imap-4.0.6.ebuild:
  Bump to 4.0.6 (from 4.0.4)
  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
  courier-imap-4.0.1-r2.ebuild:
  Mark 4.0.1-r2 stable on alpha
  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
  courier-imap-4.0.1-r2.ebuild:
  stable on ia64
  25 Aug 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
  courier-imap-3.0.8.ebuild:
  stabilize alpha
  12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
  courier-imap-4.0.4.ebuild:
  Fix courier-authlib dependency to 0.57.
 *courier-imap-4.0.4 (08 Aug 2005)
  08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
  +files/courier-imap-4.0.4-courier-imapd.rc6,
  +files/courier-imap-4.0.4-courier-imapd-ssl.rc6,
  +files/courier-imap-4.0.4-courier-pop3d.rc6,
  +files/courier-imap-4.0.4-courier-pop3d-ssl.rc6,
  +courier-imap-4.0.4.ebuild:
  Updated to 4.0.4, initd files updated for new baselayout,
  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
  courier-imap-4.0.1.ebuild:
  Stable on ppc.
 *courier-imap-4.0.1-r2 (31 May 2005)
  31 May 2005; Robin H. Johnson <robbat2@gentoo.org>
  +courier-imap-4.0.1-r2.ebuild:
  Bug #79240, courier-imap should not provide files for /etc/pam.d/.
  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
  courier-imap-4.0.1-r1.ebuild:
  Stable on ppc64
  07 Apr 2005; Simon Stelling <blubb@gentoo.org> courier-imap-4.0.1.ebuild:
  stable on amd64
  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
  courier-imap-3.0.7.ebuild, courier-imap-3.0.8.ebuild,
  courier-imap-4.0.1-r1.ebuild, courier-imap-4.0.1.ebuild:
  sys-apps/procps -> sys-process/procps
  13 Feb 2005; Jason Wever <weeve@gentoo.org> courier-imap-4.0.1.ebuild:
  Stable on sparc.
 *courier-imap-4.0.1-r1 (11 Feb 2005)
  11 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
  +files/courier-imap-4.0.1-r1-courier-imapd.indirect,
  +files/courier-imap-4.0.1-r1-courier-pop3d.indirect,
  +files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,
  +files/courier-imap-4.0.1-r1-gentoo-imapd.rc,
  +files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,
  +files/courier-imap-4.0.1-r1-gentoo-pop3d.rc,
  +courier-imap-4.0.1-r1.ebuild:
  Bug #81540, implemented a workaround for upstream removing functionality
  that is still widely used. For all users wanting to use relay-ctrl-allow,
  remove it from your courier-authlib config, and put it in
  /etc/courier-imap/{pop3d,imapd} as LOGINRUN="relay-ctrl-allow" at the end.
  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.1.ebuild:
  Marked stable on mips.
  03 Feb 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
  Stable on x86. This upgrade is non-trival. Please read:
  http://www.courier-mta.org/imap/?INSTALL.html~upgrading
  less /usr/share/doc/courier-imap-4.0.1/courier-imap-gentoo.readme.gz
  and pay attention to postinstall messages.
  16 Jan 2005; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.8.ebuild:
  Stable on hppa.
  07 Jan 2005; Tuấn Văn <langthang@gentoo.org> courier-imap-4.0.1.ebuild:
  change lib --> $(get_libdir)
 *courier-imap-4.0.1 (04 Jan 2005)
  04 Jan 2005; Tuấn Văn <langthang@gentoo.org>
  +courier-imap-4.0.1.ebuild:
  errata release
  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
  change !virtual/imapd to !mail-mta/courier
  04 Jan 2005; Tuan Van <langthang@gentoo.org> courier-imap-4.0.0.ebuild:
  turn off configure cache. it confuses the new configure script.
 *courier-imap-4.0.0 (01 Jan 2005)
  01 Jan 2005; Tuan Van <langthang@gentoo.org>
  +files/courier-imap-4.0.0-courier-imapd-ssl.rc6,
  +files/courier-imap-4.0.0-courier-imapd.rc6,
  +files/courier-imap-4.0.0-courier-pop3d-ssl.rc6,
  +files/courier-imap-4.0.0-courier-pop3d.rc6,
  +files/courier-imap-4.0.0-db4-bdbobj_configure.in.patch,
  +files/courier-imap-4.0.0-db4-configure.in.patch,
  +files/courier-imap-4.0.0-disable-fam-configure.in.patch,
  +files/courier-imap-4.0.0-gentoo-imapd-ssl.rc,
  +files/courier-imap-4.0.0-gentoo-imapd.rc,
  +files/courier-imap-4.0.0-gentoo-pop3d-ssl.rc,
  +files/courier-imap-4.0.0-gentoo-pop3d.rc,
  -files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
  -files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
  -files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
  -files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
  -files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
  -files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
  -files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
  -files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
  -files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
  -files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
  -files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc, +courier-imap-4.0.0.ebuild,
  -courier-imap-4.0.0_rc1.ebuild:
  New version release.
  23 Dec 2004; Tuan Van <langthang@gentoo.org>
  files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
  files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
  files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
  files/courier-imap-4.0.0_rc1-courier-pop3d.rc6:
  authdaemond --> courier-authlib
  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
  courier-imap-3.0.8.ebuild:
  Stable on amd64.
 *courier-imap-4.0.0_rc1 (11 Dec 2004)
  11 Dec 2004; Tuan Van <langthang@gentoo.org>
  -files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
  -files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
  -files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
  -files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
  -files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
  -files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
  -files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
  -files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
  -files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
  -files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
  -files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
  +files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
  +files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
  +files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
  +files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
  +files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
  +files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
  +files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
  +files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
  +files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
  +files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
  +files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc,
  +files/courier-imap-gentoo.readme, -courier-imap-3.0.8.20041116.ebuild,
  +courier-imap-4.0.0_rc1.ebuild:
  Release candidate.
  29 Nov 2004; Andrej Kacian <ticho@gentoo.org> courier-imap-3.0.7.ebuild,
  courier-imap-3.0.8.ebuild:
  app-admin/fam -> virtual/fam, for bug #67170.
  27 Nov 2004; Philip Walls <malverian@gentoo.org> courier-imap-3.0.8.ebuild,
  courier-imap-3.0.8.20041116.ebuild:
  Migrate to virtual/fam
 *courier-imap-3.0.8.20041116 (18 Nov 2004)
  18 Nov 2004; Tuan Van <langthang@gentoo.org>
  +files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
  +files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
  +files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
  +files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
  +files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
  +files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
  +files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
  +files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
  +files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
  +files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
  +files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
  +courier-imap-3.0.8.20041116.ebuild:
  Commit for testing only. Do not use.
  16 Nov 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.8.ebuild:
  Add virtual/imapd blocking. Bug #55309.
  16 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.8.ebuild:
  fix bug #69867.
  07 Nov 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.8.ebuild:
  Stable on sparc.
  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> courier-imap-3.0.8.ebuild:
  Marked stable on mips.
  02 Nov 2004; Tuan Van <langthang@gentoo.org> -files/authdaemond.conf,
  -files/authdaemond.rc6, -files/courier-imap-3.0.2-db40vs41.patch,
  -files/courier-imap-3.0.2-disable-fam.diff,
  -files/courier-imap-3.0.2-removerpm.patch, -files/courier-imapd-ssl.rc6,
  -files/courier-pop3d-ssl.rc6, -files/gentoo-imapd-ssl.rc,
  -files/gentoo-imapd.rc, -files/gentoo-pop3d-ssl.rc,
  -files/gentoo-pop3d.rc, courier-imap-3.0.7.ebuild,
  courier-imap-3.0.8.ebuild:
  remove cruft. fix RDEPEND use? syntax error.
  01 Nov 2004; Tuan Van <langthang@gentoo.org> -courier-imap-3.0.5.ebuild,
  courier-imap-3.0.8.ebuild:
  stable on x86.
 *courier-imap-3.0.8 (22 Sep 2004)
  22 Sep 2004; Tuan Van <langthang@gentoo.org>
  +files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch,
  +files/courier-imap-3.0.8-db4-configure.in.patch,
  +files/courier-imap-3.0.8-disable-fam-configure.in.patch,
  +courier-imap-3.0.8.ebuild:
  Version bump.
  30 Aug 2004; Tom Gall <tgall@gentoo.org> courier-imap-3.0.7.ebuild:
  stable on ppc64, bug #61745
  25 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
  Stable on x86.
  25 Aug 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.7.ebuild:
  Stable on sparc wrt bug #60865.
  25 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.7.ebuild:
  Marked stable on amd64.
  23 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.7.ebuild:
  add dohtml, remove *.html from dodoc.
  23 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.7.ebuild:
  Loosing the DB restriction now that we support DB4.
  22 Aug 2004; Rajiv Aaron Manglani <rajiv@gentoo.org>
  courier-imap-3.0.7.ebuild:
  fix up docs.
  22 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
  files/authdaemond-3.0.4-r1:
  bug #61254.
  21 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.7.ebuild:
  Fix a bug for Rajiv.
  20 Aug 2004; Guy Martin <gmsoft@gentoo.org> courier-imap-3.0.5.ebuild:
  Stable on hppa.
 *courier-imap-3.0.7 (19 Aug 2004)
  19 Aug 2004; Tuan Van <langthang@gentoo.org>
  +files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
  +files/courier-imap-3.0.7-db4-configure.in.patch,
  +files/courier-imap-3.0.7-disable-fam-configure.in.patch,
  +courier-imap-3.0.7.ebuild:
  Version bump. Add patches to support db4. Add gdbm USE flag back.
  Add logic to default to gdbm if both 'berkdb' and 'gdmb' USE flags present.
  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.5.ebuild:
  Marked stable on amd64.
  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
  courier-imap-3.0.5.ebuild:
  Stable on sparc wrt #60865
  19 Aug 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.5.ebuild:
  stable on x86. GLSA bug #60865.
  05 Jul 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
  bug #55956, backport fix I put into 3.0.5 for gdbm vs. berkdb.
  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
  courier-imap-2.1.2-r2.ebuild, courier-imap-3.0.2-r1.ebuild,
  courier-imap-3.0.2.ebuild, courier-imap-3.0.4-r1.ebuild,
  courier-imap-3.0.4.ebuild, courier-imap-3.0.5.ebuild:
  virtual/glibc -> virtual/libc
 *courier-imap-3.0.5 (26 Jun 2004)
  26 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.5.ebuild,
  files/authdaemond-3.0.4-r1, files/authdaemond.conf,
  files/authdaemond.conf-3.0.4-r1, files/authdaemond.rc6,
  files/courier-imapd-ssl.rc6, files/courier-imapd-ssl.rc6-3.0.5,
  files/courier-imapd.rc6, files/courier-pop3d-ssl.rc6,
  files/courier-pop3d-ssl.rc6-3.0.5, files/courier-pop3d.rc6,
  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
  fix bugs 42686, 52496, 39653, 52174, 52658, new upstream version.
  17 Jun 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild:
  Remove 2.1.2-r1 as per bug #54020.
  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild,
  courier-imap-3.0.4-r1.ebuild, courier-imap-3.0.4.ebuild:
  Fix use invocation
  28 May 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
  Update metadata.xml.
 *courier-imap-3.0.4-r1 (19 May 2004)
  19 May 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.4-r1.ebuild, files/authdaemond-3.0.4-r1,
  files/authdaemond.conf-3.0.4-r1:
  bug #51306 again, authdaemond changes
 *courier-imap-3.0.4 (17 May 2004)
  17 May 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.4.ebuild:
  version bump, bug #51306. severe problem found in 3.0.2.
  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
  Add inherit eutils
  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
  courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
  courier-imap-3.0.2-r1.ebuild, courier-imap-3.0.2.ebuild:
  Add die following econf for bug 48950
 *courier-imap-3.0.2-r1 (23 Apr 2004)
  23 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.2-r1.ebuild, files/courier-imap-3.0.2-disable-fam.diff:
  bug #48838, make it possible to disable fam properly, configure.in patch by
  <robbat2@gentoo.org>
 *courier-imap-2.1.2-r2 (19 Apr 2004)
  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r2.ebuild:
  remove 1.7.3-r1, add new revision of 2.1.2 with QA fixes for bug #48362
  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.2.ebuild:
  fix bug #21330 a bit better
  31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
  files/courier-imapd-ssl.rc6, files/courier-imapd.rc6,
  files/courier-pop3d-ssl.rc6, files/courier-pop3d.rc6:
  avoid bug #46351 recurring by having init scripts use famd.
  06 Apr 2004; Joshua Brindle <method@gentoo.org>
  courier-imap-2.1.2-r1.ebuild, courier-imap-3.0.2.ebuild:
  added selinux policy to rdepend
  28 Mar 2004; Jochen Maes <sejo@gentoo.org> courier-imap-3.0.2.ebuild:
  courier-imap-3.0.2.ebuild
  26 Mar 2004; Jason Wever <weeve@gentoo.org> courier-imap-3.0.2.ebuild:
  Marked stable on sparc wrt bug #45584.
  26 Mar 2004; Jon Portnoy <avenj@gentoo.org>
  courier-imap-3.0.2.ebuild :
  Stable on AMD64
  26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-3.0.2.ebuild:
  clean up vpopmail and more in ebuild. bump to x86 for security bug #45584.
 *courier-imap-3.0.2 (26 Mar 2004)
  26 Mar 2004; <solar@gentoo.org> courier-imap-3.0.2.ebuild,
  files/courier-imap-3.0.2-db40vs41.patch,
  files/courier-imap-3.0.2-removerpm.patch:
  courier-imap <3.0.0: Courier Multiple Remote Buffer Overflow Vulnerabilities.
  bug #45584
  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> courier-imap-2.1.2-r1.ebuild,
  files/courier-imap-2.1.2-res_query.patch:
  Add patch for res_query to allow courier-imap to compile on amd64. Should close #41160.
  22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
  Remove arm keywords
  28 Jan 2004; Jon Portnoy <avenj@gentoo.org> courier-imap-2.1.2-r1.ebuild :
  AMD64 keywords.
  18 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild:
  fix bug #38606.
  08 Jan 2004; Jason Wever <weeve@gentoo.org> courier-imap-2.1.2-r1.ebuild:
  Added ~sparc keyword.
  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild:
  fix bug #33346
  09 Dec 2003; Martin Holzer <mholzer@gentoo.org>
  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
  adding RESTRICT="nomirror"
  07 Dec 2003; foser <foser@gentoo.org> courier-imap*.ebuild :
  Fix fam-oss dep to fam, due to move
  14 Nov 2003; Rajiv Aaron Manglani <rajiv@gentoo.org>
  courier-imap-1.7.3-r1.ebuild:
  marked stable on ppc.
  31 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild:
  fix bug #32410, bump to stable
  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild, files/courier-imap-2.1.2-removerpm.patch:
  commit brandy's patch for bug #28070
 *courier-imap-2.1.2-r1 (02 Oct 2003)
  02 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2-r1.ebuild:
  add fam support - bug #29879
 *courier-imap-2.1.2 (25 Sep 2003)
  25 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.2.ebuild:
  version bump
  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.1.ebuild:
  add fix for bug #27528, and add a few comments about the last fix too
  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.1.ebuild, files/courier-imap-2.1.1-db40vs41.patch:
  apply Brandy's patch for bug #27517
 *courier-imap-2.1.1 (28 Aug 2003)
  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
  courier-imap-2.1.1.ebuild:
  version bump, fix ipv6 bug, another attempted tcltk fix
 *courier-imap-2.0.0 (31 Jul 2003)
  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-2.0.0.ebuild:
  Bump to latest stable upstream version, new fix for userpriv
 *courier-imap-1.7.3-r1 (31 Jul 2003)
  31 Jul 2003; Robin Hugh Johnson <robbat2@gentoo.org> courier-imap-1.7.3-r1.ebuild,
  files/gentoo-imapd-1.7.3-r1.rc, files/gentoo-imapd-ssl-1.7.3-r1.rc,
  files/gentoo-pop3d-1.7.3-r1.rc, files/gentoo-pop3d-ssl-1.7.3-r1.rc:
  Fixed Prerun support again, bump to x86.
  10 Jun 2003; <msterret@gentoo.org> courier-imap-1.7.1.ebuild,
  courier-imap-1.7.2.ebuild, courier-imap-1.7.3.ebuild:
  DEPEND on sed >= 4
 *courier-imap-1.7.3 (20 May 2003)
  27 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
  Fix bug #21803
  25 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
  Fix bug #21577
  20 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: 
  Version bump and move warning message. Removed extraneous cflag filtering.
  Fixed bug #21330 as well.
 *courier-imap-1.7.2 (19 May 2003)
  19 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.2.ebuild, 
  files/gentoo-imapd-ssl.rc, files/gentoo-imapd.rc, files/gentoo-pop3d-ssl.rc,
  files/gentoo-pop3d.rc:
  Version bump. Fixed DB3/DB4 stuff properly (minor bug in sed-foo).  Install
  all auth modules. Added prerun support for some other mail stuff.  Fix
  SRC_URI. Fix Vpopmail support. Other misc cleanups.
 *courier-imap-1.7.1 (30 Apr 2003)
  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.1.ebuild:
  version bump. workaround db3/db4 coexisting problems. added
  /var/lib/courier-imap
  18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/gentoo-*.rc :
  Updated gentoo-*.rc with fix0rs found by Psi-Jack!
 *courier-imap-1.7.0 (01 Feb 2003)
  11 Apr 2003; Alastair Tse <liquidx@gentoo.org> courier-imap-1.7.0.ebuild:
  deps now reflect that it needs db3 and nothing else. fixes #18734.
  04 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild :
  Updated vpopmail detection to account for a different home directory
  for vpopmail.
  01 Feb 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.7.0.ebuild,
  files/digest-courier-imap-1.7.0 :
  Version bump.  Includes some postgres changes and other fixes.
 *courier-imap-1.6.2-r1 (29 Jan 2003)
  29 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2-r1.ebuild,
  files/digest-courier-imap-1.6.2-r1 :
  Now filtering -funroll-loops and -fomit-frame-pointer like in the
  courier ebuild.
 *courier-imap-1.6.2 (31 Dec 2002)
  14 Jan 2003; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
  Tamed down the postgres dependancy.
  09 Jan 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild :
  Marked stable for x86.
  31 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.2.ebuild,
  files/digest-courier-imap-1.6.2 :
  Version bump.  new ebuild logic for unicode support.  Added postgres
  use variable support.
 *courier-imap-1.6.1 (12 Dec 2002)
  25 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.1.ebuild,
  files/gentoo-imapd-1.6.1.rc, files/gentoo-imapd-ssl-1.6.1.rc,
  files/gentoo-pop3d-1.6.1.rc, files/gentoo-pop3d-ssl-1.6.1.rc :
  Updated the gentoo rc files and ebuild as logger has changed
  to courierlogger.
  12 Dec 2002; Nick Hadaway <raker@gentoo.org>
  courier-imap-1.6.1.ebuild, files/digest-courier-imap-1.6.1 :
  Version bump.  Added a test for vpopmail so proper configure options
  are passed.
 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 *courier-imap-1.5.3 (25 Sep 2002)
  25 Sep 2002; Nick Hadaway <raker@gentoo.org>
  courier-imap-1.5.3.ebuild, files/digest-courier-imap-1.5.3 :
  Version bump.  Lots of SSL fixes.
 *courier-imap-1.5.1 (03 Aug 2002)
  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
  courier-imap-1.5.1.ebuild, files/authdaemond.conf,
  files/authdaemond.rc6 :
  Updated authenticator choosing mechanism.  Removed pgsql authenticator
  as it is not a supported backend.
  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
  Added ppc to keywords.
  03 Aug 2002; Nick Hadaway <raker@gentoo.org>
  courier-imap-1.5.1.ebuild, files/digest-courier-imap-1.5.1 :
  Version bump.  Added support for unicode searching, and proper
  listening to the ipv6 use variable.
 *courier-imap-1.5.0 (24 Jun 2002)
  22 Jul 2002; Nick Hadaway <raker@gentoo.org> authdaemond.rc6 :
  Fixed small typo.  changed pqsql to pgsql.  Closes bug #5163.
  26 Jul 2002; Nicholas Jones <carpaski@gentoo.org :
  Added in a check for vpopmail as Courier-IMAP just assumes that if
  the user exists, then all the files MUST exist.
  24 Jun 2002; Donny Davies <woodchip@gentoo.org> :
  Chase latest release.
 *courier-imap-1.4.5-r3 (20 Jun 2002)
  20 Jun 2002; Kyle Manna <nitro@gentoo.org> :
  Moved maildirmake for /usr/sbin to /usr/bin, close bug #3844
 *courier-imap-1.4.5-r2 (14 Jun 2002)
  14 Jun 2002; Kyle Manna <nitro@gentoo.org> :
  Forgot to install /etc/init.d/authdaemond
 *courier-imap-1.4.5-r1 (8 Jun 2002)
  8 Jun 2002; Kyle Manna <nitro@gentoo.org> :
  Added pop3 init scripts.
 *courier-imap-1.4.3-r1 (30 Apr 2002)
  30 Apr 2002; Donny Davies <woodchip@gentoo.org> :
  Added tcltk? ( >=dev-tcltk/expect-5.33.0 ) to RDEPEND, closing #2282.
 *courier-imap-1.4.3 (1 Apr 2002)
  1 Apr 2002; Donny Davies <woodchip@gentoo.org> :
  Updated to latest release.  Added --enable-workarounds-for-imap-client-bugs
  to ./configure which helps some clients; notably Netscape Messenger.  Now
  installs a pam_stack aware pam.d/ file.
 *courier-imap-1.4.1-r4 (14 Mar 2002)
  14 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
  Fixed bug where /etc/courier-imap/pop3d didn't have MAILDIR=.maildir set.
 *courier-imap-1.4.1-r2 (21 Feb 2002)
 21 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> :
  Modified the ebuild so that /usr/sbin/{imapd,pop3d} get renamed to
  /usr/sbin/{courier-imapd,courier-pop3d}.  I also had to change hack
  the /usr/lib/courier-imap/*.rc files to call these newly-named functions.
  While I was at it I cleaned up the ebuilds and fixed the not-yet-caught
  bug that pop3d was still trying to use Maildir instead of ${MAILDIR}.
  Fixes bug #584.
 *courier-imap-1.4.1-r1 (1 Feb 2002)
  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
  Added initial ChangeLog which should be updated whenever the package is
  updated in any way. This changelog is targetted to users. This means that the
  comments should well explained and written in clean English. The details about
  writing correct changelogs are explained in the skel.ChangeLog file which you
  can find in the root directory of the portage repository.
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@ -1,56 +0,0 @@
 AUX authdaemond-3.0.4-r1 1062 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 SHA1 55180242453ee47c951d265615da7a0902a5dc1f SHA256 2731b87fec98ae4ecdb5cfdb5917894e28eaf768f68555462d801c116cfa2a0d
 AUX authdaemond.conf-3.0.4-r1 544 RMD160 52c3d3ec3c720ef36d03b531e9f4408149769d19 SHA1 f433ce39a182b7e2d7c91d22c59546e5fc552d83 SHA256 6bbf884df95152b5f8e1b0cd404a1833c1e337ccd44360156296122d2c9bb72f
 AUX courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
 AUX courier-imap-3.0.8-db4-configure.in.patch 1337 RMD160 61f09bd94189576acc3b41a5aee9605d1f0c95de SHA1 e06ef1f954e0c0deaabe548abe559525d2fe918a SHA256 5f749b10f53d3a631af65f3766f3d72e54603761b164a2a656a59aee78c67939
 AUX courier-imap-3.0.8-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
 AUX courier-imap-4.0.1-courier-imapd-ssl.rc6 1215 RMD160 895e04e9d0fc49fa5e2a022b070c09e31706918b SHA1 55e6a427c1acae17853fe016dc38068a9f3456b6 SHA256 7724a4e51effba581872917244a56d165506a813a923c4126323d93985ea5c2f
 AUX courier-imap-4.0.1-courier-imapd.rc6 970 RMD160 cc29497750a0d4c1f09a8dde111b3e387bf902bd SHA1 34f0bf3456ad6d33280216940807cf5805214cd6 SHA256 adde0c60fb7d66253c791197631281efb57975cb130b7e70925cac03a1085d5a
 AUX courier-imap-4.0.1-courier-pop3d-ssl.rc6 1223 RMD160 ce2d8a86fb20da03d9a3b085032cc1c68d48b3b9 SHA1 021a3b52493dfd1c97614a31f1015ad947a58e9b SHA256 ecb4258a140359940637f84c1457c885e57aa0f45a6b5c3247db4d413219680f
 AUX courier-imap-4.0.1-courier-pop3d.rc6 978 RMD160 fbcc8eaaa0c68e29beaa83236d165ed489a0eea7 SHA1 b66127eab29e9e0a44469a5e2aebe1582518b3d0 SHA256 a66aa6fd10ab8d43bc28357b1c9db63afb80e6c66b8fa47fa26214c40cf1bcf7
 AUX courier-imap-4.0.1-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
 AUX courier-imap-4.0.1-db4-configure.in.patch 1303 RMD160 69228d5d2fb61bf176581c22a0a02e795342595e SHA1 75e73e48fb91c22996bdbd6417d30a6698a96309 SHA256 f7d626d03e6a83a6851be1ec7b1ad8b24e26d20fa1a2cf87ebce4560c226c2c3
 AUX courier-imap-4.0.1-disable-fam-configure.in.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
 AUX courier-imap-4.0.1-gentoo-imapd-ssl.rc 1092 RMD160 d32cbf015f9fda6bbeee1bfa054c39a08ccead95 SHA1 9f5ad90b96a40c0cd3d910e5390d7f648c2c0046 SHA256 1feabc5a11925e8a9abef29b3797b6f8ee6c9935f726e4a9af918f2f9879b797
 AUX courier-imap-4.0.1-gentoo-imapd.rc 1129 RMD160 db3c0dfea4074482144fca2195acbbc18a9b395b SHA1 6b0966aeace6d643c63e902443cf782ad5c81422 SHA256 0814d73c7eb1cd857288390b3e8206fa8037bccb2d17c4998e18d351da87fcf7
 AUX courier-imap-4.0.1-gentoo-pop3d-ssl.rc 1067 RMD160 a33364035b91a371da9e0b7a6cd1f8af075edcd9 SHA1 df93bd12d2afeafc6576d67a0d945827e791c298 SHA256 7ffa8c0a0788ad70332c5351aebf58be715b8ed6f7ace887c3163b4b4282d397
 AUX courier-imap-4.0.1-gentoo-pop3d.rc 1075 RMD160 8cc119405c18525fbc3bed9a5ea1be3ac3cb02b8 SHA1 cf79243fbf860c0082b39df9ba16d726b198ccf6 SHA256 a81f912ff7542f6cb3fee162a75a045606b5f1175264a0b5b303a9d5c1c4a1d1
 AUX courier-imap-4.0.1-r1-courier-imapd.indirect 85 RMD160 3b6790ccee0c7271c23f76a393b9d0a0d0b575ef SHA1 807e2294f80b95f0bae856a64774ffed7175dbef SHA256 96f7cd8cb1f4817be039df630b0e5da3838530955881b7217527307514b1b8a3
 AUX courier-imap-4.0.1-r1-courier-pop3d.indirect 85 RMD160 f0750ff2a958b9a24112c9352bdc6a70b4a077f4 SHA1 6b7859075554104f0fe04f1e74fde2565a77e65d SHA256 df03082133b598631c4e47b5f448bba385f5993c0bd55a4eca9637b8176d8593
 AUX courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc 1114 RMD160 c68bdfd5e7d73a0977db02833fad84efa4697419 SHA1 9ced6a64c1c7f8e0843f8e63c36f057ab6ed1ef3 SHA256 d632673bb34aa049205682d7c26c4972623589bbcace6604bf6c81a91d02d30d
 AUX courier-imap-4.0.1-r1-gentoo-imapd.rc 1151 RMD160 c0e1c3402382b62210a4855e1fe5239bcce3e06a SHA1 087ca38c92d82c3cf6a94aa2c97368415a28b72e SHA256 c9929c008990b5e4602f2b9e2654875c25f5cc776e1d0c433f16c716a327afa6
 AUX courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc 1089 RMD160 1b0339c606987f6c230d7b7e962a098c01bba0e3 SHA1 4cb7a81534d19f45c065b41139ee66a51ff64c61 SHA256 ce0ce1e14324ce8d6633aad60762b4bcc7dc79a94047b6aa45a670b4e897393e
 AUX courier-imap-4.0.1-r1-gentoo-pop3d.rc 1097 RMD160 d138103cf9fd92ebc7806593eb79b22a4aea4d50 SHA1 d2d7e885e37e8d4510f440ab3e94593ce02eef86 SHA256 6e7fd5f98e40504c0da0236bdfeadad33cf95cc8dfe31af8207d23620f27b84d
 AUX courier-imap-4.0.4-courier-imapd-ssl.rc6 1174 RMD160 a7e9593106447b743cc8dc153664869924a152a2 SHA1 984c4e7324e890290c3ae793f9afdf855991a205 SHA256 ef3d363558c64dcb3b6429de700eb4bc1557c622dbfad2e26abe98f59c18329f
 AUX courier-imap-4.0.4-courier-imapd.rc6 929 RMD160 4aec3c1c2fd1e32ff8fc89bc4d89b7b1227cda57 SHA1 bb919257cdd11f66bf448db86539d784ca539ccf SHA256 5187c9dbaaeceb98273e719b676fe7197bcfa215dfdf05c9d8cb161af48e3146
 AUX courier-imap-4.0.4-courier-pop3d-ssl.rc6 1182 RMD160 61a232d9de309f8a79c9ee05a412afc3265f0b21 SHA1 e337b7ba969462e896c595b205eb1b15d2860a5e SHA256 bc1e61890624d9ecc930d33785879b6d22bea6ac962be5f2aad1529a024c88f3
 AUX courier-imap-4.0.4-courier-pop3d.rc6 937 RMD160 aa08726aefd6fd3dad6cf2003de853869eb2d71a SHA1 2728ecebabcb5210c6d7f985df777b14a1edc5d3 SHA256 70c526347c8c53888df1bc6602d242376e9ef885a2b125d5292363c082dc4fca
 AUX courier-imap-4.0.6-aclocal-fix.patch 237 RMD160 005a1b1bcff427b747b5fdae0fbe678367e7ebfa SHA1 9593c438e8b6be719d1685f5398659bb841f115b SHA256 2bc930268fd9c1565f2dfc341557de4a6e4f867131b279d52d47d285e5f62579
 AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1558 RMD160 ae5866697c98a760e11927faa69687b942795ff3 SHA1 e6fd4defb33644d806679e00f2eb056e7f72170e SHA256 208e443f2730237ee8ae858eb21c3895c83651fbaacda881bdf46076b5182db7
 AUX courier-imap-4.0.6-db4-configure.in.patch 1497 RMD160 77a9ad984789ab56c5d91d8b276b5c34a0e3b909 SHA1 349ad8d16c05ba0c7a7231b092286f48fecca54b SHA256 53db1d9b267e2d753ca6e27149008b5f92e11ddea7260f44c616b7cc3327d67c
 AUX courier-imap-4.0.6-db4-tcpd_configure.in.patch 264 RMD160 49e1deaa1d006b1f3bd8d68ebad037fd934d3d06 SHA1 836208b414a72cf426a17e27f4c6dcf3c88138f3 SHA256 553b9b20afad380b2901318b6b2152b14c1f26ed3bfe26126364284f143cdd21
 AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1200 RMD160 cfe0a24af1c4ca8ae1bbeafb25612a790961fd68 SHA1 77363438726d1e2fd7b9afb11b6bd2223fd75775 SHA256 c417f5de1bf2eeb5a7918931c30f1902d9f463279d8aa73ea0e13623923805df
 AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 RMD160 0d74ba0662418361e275a9762990771869485ac9 SHA1 404ae233fed0d3ad252e4a2897a5d01f6b613ade SHA256 5d2e175e20aa5d7b7049a76be847a9bd974d25625b5324ac8f23680cb7e734bc
 AUX courier-imap-4.0.6-r1-courier-imapd.rc6 949 RMD160 484cdac2b40e6f8dbad3a604a8ab2d3967226952 SHA1 562a624818140ed324cdaf2cb7d3541f7b5a48f7 SHA256 67406394a81a4ca697b8d08e987a0680b4e7622ac30ea009241b002f1d3adc8e
 AUX courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 1208 RMD160 8a997b6299c6a3de6dcd3e4b2d7c5171286e466a SHA1 0e007a0a8964e2c0523f187b0aed291008d70c2b SHA256 dec6250978b39b6dd1bfbea0b0dbd108ca60171db04135dff66c5ae73a7a33e6
 AUX courier-imap-4.0.6-r1-courier-pop3d.indirect 81 RMD160 047384e594e26ef2148085b0c5b88dba98187617 SHA1 3872f619cc6a5c91d3454e450638802e37556cda SHA256 27fa269811a3f916b050166733232e5de1fa578c0f3cb79ca649e6b0cff67ea5
 AUX courier-imap-4.0.6-r1-courier-pop3d.rc6 957 RMD160 d1502bbce31fc6a26cb3adf073abfe2b91bf29f3 SHA1 8db1f39de8d4041c96be3a5c04c6ecb763c6b00f SHA256 f3c8996471543ca35a9d4af6f2a7e5bc4fc5c9820dcc461792231236fababa69
 AUX courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc 984 RMD160 93671fcb0eb2660ef41edf9ffc404c864bc369b7 SHA1 fc0c25e11555384db3fb7756a4c6b78d9c8c8e7e SHA256 dd79242bddbd46f7eabbd99da612c4189bbc998e3680bf9d50f6788783ba820e
 AUX courier-imap-4.0.6-r1-gentoo-imapd.rc 1026 RMD160 1bd16e446e10da64352390803cbaa691c11ecc68 SHA1 b8eb095bb6c8b6c970dd60e944ebfd2f36a39b40 SHA256 a54e674a8bfce99cda974e5c2e9bd818440256130f018f1c3412ea29f4e618f1
 AUX courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc 957 RMD160 7dcbfe1e550601ebdd973394ff03f19701425254 SHA1 d5bc5e06275d4082ab9b76c739d9da491a08cafd SHA256 977ddb360fe8a4a2baab932895c1d871b992d33d2837d97af23d7a97f66dc6a6
 AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 999 RMD160 10028f0deafad4b31b12e4006ace1a007b542495 SHA1 5db7530c017c1e0a4cdb02a67bc5256f9b790110 SHA256 e9ec918c6a9f1ac3ad952d7c15392ab73f0a2e6a27f4f8a1f3fe3902c67ea278
 AUX courier-imap-4.1.2-as-needed.patch 398 RMD160 0cda873874a9261cd0f640703fdb0c7cfb79e044 SHA1 53ab7b464ed0daf167066c323827524a653964e0 SHA256 8d1185d1929ab1cce5216f188adeb66a52ede20fbcb95b45d9b7a39287f884e3
 AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
 AUX courier-imapd-ssl.rc6-3.0.5 1196 RMD160 b3d21018f32d59c8db09491aa5d25e99ef5022ca SHA1 b25b6d29cba405ba7ea96223d564178f7cce8ece SHA256 818217507f3d27aebf9f14fa10a9eb9805b605c5bacc7a936e8610127816fd76
 AUX courier-imapd.rc6 945 RMD160 1446c5fdc95aceeebfb670e501d2f6d0f8e15c5b SHA1 77f36e56631db5be6f51377386a6059e9f48244f SHA256 37d2d245f58dbfeca4f6c15f3dffbb652daaae18ba07973989f661ce00f23178
 AUX courier-pop3d-ssl.rc6-3.0.5 1204 RMD160 c1638bd94fadc331cc97cc54462c9d9ed8fbd986 SHA1 7c1956c410179881430be2580561f6ea6c6fd5c2 SHA256 4a107d764d17ec217ecaeaa57504bb893558b0bc8fa5e82af33a3c63771d60a4
 AUX courier-pop3d.rc6 953 RMD160 c98bce7aabef2e138febf10e4c8bab86026216d4 SHA1 0aa6898254e70b0f2f13b9b3cc68e9895f9d4a3b SHA256 e64d98087123a432b528a301bb5a4f1d6ef6232a39c981318f8159297f775f76
 AUX gentoo-imapd-1.7.3-r1.rc 1074 RMD160 0fec4a1dc289b348e0605152467e603a2674847a SHA1 5eae59350ef88024041cad7bb8b4e7c79ea03b43 SHA256 52ad1bb47496be6fdd5a943cc5d156e18f4429c7b3f9d4d89670d451023db9e7
 AUX gentoo-imapd-ssl-1.7.3-r1.rc 1036 RMD160 441ee24be1825ab8cfb485cad5df329a1aa008fa SHA1 7791e6fc38cce038562b8dee868ec83c6e06a5c1 SHA256 2430819bae8e265934ac31944534ef8e3ab94dfe0e59a3ea658f60ebdd7d989b
 AUX gentoo-pop3d-1.7.3-r1.rc 1020 RMD160 e0c83f2cf3507cd8b08dd53f47abe3dcbeb10c8a SHA1 bab1db4ee5f31e33c8ca81ebab7cd46e93a908bc SHA256 189dca5b4fa90405e25f7d659b984c10a705d6c9a725f0571bc37d784793911b
 AUX gentoo-pop3d-ssl-1.7.3-r1.rc 1012 RMD160 d967c3996f95e113e7e6f9dd0a62b418c37d6ee4 SHA1 b8cfb3069000e2a70e0aa836b231fa40bdeef6c7 SHA256 12659fbc648e66ccfd5b62f75a9cc4a580f56b35ddb02f1460b6ce2726050e0d
 AUX mkimapdcert 996 RMD160 4ca3c600dc558f14648f318007447318a5e45165 SHA1 a1259ae6a18d4c2b2d783da72b730437fe0ffc2f SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6
 AUX mkpop3dcert 996 RMD160 424c61ae95914f267397a1180dcb8fee64586ea3 SHA1 28f43f0f62999105fe37b6a2edd5a0cbf8cee157 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb
 DIST courier-imap-4.4.1.tar.bz2 3383036 RMD160 ae1feff71b6dbd893ba1866bf4bf974e84210236 SHA1 c5d7a2790f6ce0ed7eda90a36268a1e772627bd7 SHA256 d7cff71f0aaf34ea8dc6823550dadf62def4f616b750548bf0512f12d1b4725f
 EBUILD courier-imap-4.4.1-r1.ebuild 8187 RMD160 127d664188a5f978cba36626bda730d61d72975c SHA1 fa939d4f44acfd0ca6de5f68042ee70e391be2b5 SHA256 4aca572a7de258e15de9ff875add8cafaa49cc1f91b4a994a0b3210a37da0b58
 MISC ChangeLog 33000 RMD160 91058c94ffbb878429e24f4bb6c401c02211a6c5 SHA1 3b34cadeff42df4421836bf225e204488a23504b SHA256 1c72fbe6ec6c63c4bb6635b074c89c1ce20bc6f9a2b46076b925fc22bb3c8e50
 MISC metadata.xml 258 RMD160 897ec10251e2fc462bdbb9780e945c896f44c7c1 SHA1 4f790bcbe4149520174095bb7e048a8e39fbfc16 SHA256 87167a6f2c7b3c99a92806e11600b3c9bfb1b51126a670fd2bc9b4358935f810
--- a/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild
@ -1,250 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.4.1-r1.ebuild,v 1.1 2008/12/14 21:19:10 mabi Exp $
 inherit autotools eutils multilib libtool
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
 DESCRIPTION="An IMAP daemon designed specifically for maildirs."
 HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls"
 # userpriv breaks linking against vpopmail
 RESTRICT="userpriv"
 RDEPEND="gnutls? ( net-libs/gnutls )
 		!gnutls? ( >=dev-libs/openssl-0.9.6 )
 		>=net-libs/courier-authlib-0.61
 		>=net-mail/mailbase-0.00-r8
 		berkdb? ( sys-libs/db )
 		fam? ( virtual/fam )
 		gdbm? ( >=sys-libs/gdbm-1.8.0 )
 		selinux? ( sec-policy/selinux-courier-imap )"
 DEPEND="${RDEPEND}
 		dev-lang/perl
 		!mail-mta/courier
 		userland_GNU? ( sys-process/procps )"
 RDEPEND="${RDEPEND}
 		!virtual/imapd"
 PROVIDE="virtual/imapd"
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
 pkg_setup() {
 	if ! use berkdb && ! use gdbm ; then
 		echo
 		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
 		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
 		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
 		echo
 		die "Required USE flag missing."
 	fi
 }
 vpopmail_setup() {
 	VPOPMAIL_INSTALLED=
 	VPOPMAIL_DIR=
 	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
 	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
 	VPOPMAIL_INSTALLED=
 	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
 		VPOPMAIL_INSTALLED=1
 	else
 		VPOPMAIL_DIR=
 	fi
 }
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Bug #48838. Patch to enable/disable FAM support.
 	# 20 Aug 2004 langthang@gentoo.org
 	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
 	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
 	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
 	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
 	# These patches should fix problems detecting BerkeleyDB.
 	# We now can compile with db4 support.
 	if use berkdb ; then
 		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
 		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
 	fi
 	ebegin "Recreating configure"
 	eautoreconf || die "eautoreconf failed"
 	eend $?
 }
 src_compile() {
 	vpopmail_setup
 	local myconf=""
 	# 19 Aug 2004 langthang@gentoo.org
 	# Default to gdbm if both berkdb and gdbm are present.
 	if use gdbm ; then
 		einfo "Building with GDBM support"
 		myconf="${myconf} --with-db=gdbm"
 	elif use berkdb ; then
 		einfo "Building with BerkeleyDB support"
 		myconf="${myconf} --with-db=db"
 	fi
 	# The default character set is ISO-8859-1/US-ASCII.
 	# USE 'nls' will enable all available character sets.
 	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
 	# to include only specified translation tables.
 	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
 		einfo "ENABLE_UNICODE is not set, building with all available character sets"
 		myconf="${myconf} --enable-unicode"
 	elif use nls ; then
 		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
 		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
 	else
 		einfo "Disabling unicode support"
 		myconf="${myconf} --disable-unicode"
 	fi
 	use debug && myconf="${myconf} debug=true"
 	# Fix for bug #21330
 	CFLAGS="$(echo ${CFLAGS} | xargs)"
 	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
 	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
 	# Do the actual build now
 	LDFLAGS="${LDFLAGS} " econf \
 		--disable-root-check \
 		--bindir=/usr/sbin \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/${PN} \
 		--libexecdir=/usr/$(get_libdir)/${PN} \
 		--localstatedir=/var/lib/${PN} \
 		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
 		--enable-workarounds-for-imap-client-bugs \
 		--with-mailuser=mail \
 		--with-mailgroup=mail \
 		$(use_with fam) \
 		$(use_with ipv6) \
 		$(use_with gnutls) \
 		${myconf} || die "econf failed"
 	# Change the pem file location.
 	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
 		imap/imapd-ssl.dist || \
 		die "sed failed"
 	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
 		imap/pop3d-ssl.dist || \
 		die "sed failed"
 	emake -j1 || die "emake failed"
 }
 src_install() {
 	vpopmail_setup
 	dodir /var/lib/${PN} /etc/pam.d
 	emake DESTDIR="${D}" install || die "emake install failed"
 	rm -Rf "${D}/etc/pam.d"
 	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
 	cd "${D}/usr/sbin"
 	for name in imapd pop3d ; do
 		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
 	done
 	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
 	# 'Maildir', and to use /usr/sbin/courier-foo names.
 	cd "${D}/usr/$(get_libdir)/${PN}"
 	for service in {imapd,pop3d}{,-ssl} ; do
 		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
 		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
 	done
 	# Rename the config files correctly and add a value for ${MAILDIR} to them.
 	cd "${D}/etc/${PN}"
 	for service in {imapd,pop3d}{,-ssl} ; do
 		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
 		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
 		echo 'MAILDIR=.maildir' >> "${service}"
 		echo 'MAILDIRPATH=.maildir' >> "${service}"
 	done
 	for service in imapd pop3d ; do
 		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
 		echo 'PRERUN=' >> "${service}"
 		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
 		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
 		echo 'LOGINRUN=' >> "${service}"
 	done
 	cd "${D}/usr/sbin"
 	for x in * ; do
 		if [[ -L "${x}" ]] ; then
 			rm -f "${x}" || die "Failed to rm ${x}"
 		fi
 	done
 	cd ../share
 	mv -f * ../sbin
 	mv -f ../sbin/man .
 	cd ..
 	for x in mkimapdcert mkpop3dcert ; do
 		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
 	done
 	exeinto /usr/sbin
 	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
 	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
 	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
 	for initd in courier-{imapd,pop3d}{,-ssl} ; do
 		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
 		doinitd "${initd}" || die "doinitd ${initd} failed"
 	done
 	exeinto /usr/$(get_libdir)/${PN}
 	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
 		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
 		doexe "${exe}" || die "doexe ${exe} failed"
 	done
 	dodir /usr/bin
 	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
 	# Bug #45953, more docs.
 	cd "${S}"
 	dohtml -r "${S}"/*
 	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
 	docinto imap
 	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
 	docinto maildir
 	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
 	docinto tcpd
 	dodoc "${S}"/tcpd/README.couriertls
 }
 pkg_postinst() {
 	elog "Authdaemond is no longer provided by this package."
 	elog "Authentication libraries are now in courier-authlib."
 	elog "For a quick-start howto please refer to:"
 	elog "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
 	# Some users have been reporting that permissions on this directory were
 	# getting scrambled, so let's ensure that they are sane.
 	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
 }
 src_test() {
 	ewarn "make check is not supported by this package due to the"
 	ewarn "--enable-workarounds-for-imap-client-bugs option."
 }
--- a/net-mail/courier-imap/files/authdaemond-3.0.4-r1
+++ b/net-mail/courier-imap/files/authdaemond-3.0.4-r1
@ -1,42 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond-3.0.4-r1,v 1.3 2004/08/22 23:52:08 robbat2 Exp $
 depend() {
 	need net
 }
 checkconfig() {
 	if [ ! -e /etc/courier-imap/authdaemonrc ] ; then
 		eerror "You need an /etc/courier-imap/authdaemonrc file to run authdaemon"
 		return 1
 	fi
 }
 setauth() {
 	source /etc/courier-imap/authdaemonrc
 	AUTHLIB="/usr/lib/courier-imap/authlib"
 	source /etc/courier-imap/authdaemond.conf
 	[ -z "$version" ] && version="${AUTHDAEMOND}"
 	pidfile="/var/run/authdaemon.pid"
 	logger="/usr/lib/courier-imap/courierlogger"
 }
 start() {
 	checkconfig || return 1
 	setauth
 	ebegin "Starting ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
 		/usr/bin/env -- - $logger -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
 	eend $?
 }
 stop() {
 	setauth
 	ebegin "Stopping ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --stop \
 		--pidfile "$pidfile"
 	eend $?
 }
--- a/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1
+++ b/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1
@ -1,14 +0,0 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/authdaemond.conf-3.0.4-r1,v 1.2 2004/06/26 23:30:58 robbat2 Exp $
 # This file should contain your chosen authenticator
 # This overrides 'version' in /etc/courier-imap/authdaemonrc
 # Valid choices are..
 #
 # AUTHDAEMOND="authdaemond.plain"
 # AUTHDAEMOND="authdaemond.mysql"
 # AUTHDAEMOND="authdaemond.pgsql"
 # AUTHDAEMOND="authdaemond.ldap"
 #
 AUTHDAEMOND="authdaemond.plain"
--- a/Show More
+++ b/Show More
		`@ -1,2 +0,0 @@`
			`PATH=/opt/firebird/bin`
			`ROOTPATH=/opt/firebird/bin`
`@ -1,2 +1,2 @@`
	`DIST ICEpdf-4.1.0-src.zip 2387613 RMD160 7b233209f121eded71a1e0175659e13f6abef17e SHA1 09931f71c60d5950fc8dfadc5c8c1f0aa8554788 SHA256 b03bd7cd4bde411e74b6bc54f6984bac9a15d6429ef88c9c86c53206eea5d4e3`	`DIST ICEpdf-4.1.1-src.zip 2403094 RMD160 b3c86d7d96caa10158634e5ec64b4a30c9777354 SHA1 dd9128358d41611a3398358667b260039700eef8 SHA256 73ab7a02b2ec7b68812b4c5c6f62241394f022570e8d984b7993d8cea053d562`
	`EBUILD ICEpdf-4.1.0.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f`	`EBUILD ICEpdf-4.1.1.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f`