From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7C698138200 for ; Sat, 18 May 2013 23:44:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96784E088C; Sat, 18 May 2013 23:44:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB57DE088A for ; Sat, 18 May 2013 23:44:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5F0733E2ED for ; Sat, 18 May 2013 23:44:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 53B99E5459 for ; Sat, 18 May 2013 23:44:17 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1317174544.2fc4516ce650389ec02311ba0dc8e2eb9c41da10.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:ni-experimental commit in: / X-VCS-Repository: dev/dilfridge X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 2fc4516ce650389ec02311ba0dc8e2eb9c41da10 X-VCS-Branch: ni-experimental Date: Sat, 18 May 2013 23:44:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ecbee591-0bcb-48de-9d34-8cde698874db X-Archives-Hash: 2dd6e18272aad4fa349983970211743a commit: 2fc4516ce650389ec02311ba0dc8e2eb9c41da10 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Wed Sep 28 01:49:04 2011 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Wed Sep 28 01:49:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=2fc4516c Completed merge Merge branch 'master' of git+ssh://git.overlays.gentoo.org/dev/dilfridge Conflicts: media-libs/opencv/ChangeLog media-libs/opencv/Manifest media-libs/opencv/todo.txt media-libs/opencv/ChangeLog | 3 + media-libs/opencv/Manifest | 24 +--- media-libs/opencv/files.txt | 206 -------------------------- media-libs/opencv/todo.txt | 9 - www-misc/zoneminder/ChangeLog | 4 + www-misc/zoneminder/Manifest | 32 ++-- www-misc/zoneminder/todo.txt | 13 -- www-misc/zoneminder/zoneminder-1.25.0.ebuild | 8 +- 8 files changed, 29 insertions(+), 270 deletions(-) diff --cc media-libs/opencv/ChangeLog index fd106c9,10d7bf1..e8e151d --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@@ -2,16 -2,10 +2,19 @@@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $ + 28 Sep 2011; Andreas K. Huettel opencv-2.1.0.ebuild, + opencv-2.2.0-r10.ebuild, opencv-2.3.0.ebuild, + +files/opencv-2.3.0-libpng15.patch: + Resync with main tree + + 18 Sep 2011; Andreas K. Huettel -files.txt, -todo.txt: + Cleanup + 18 Sep 2011; Andreas K. Huettel opencv-2.3.0.ebuild, + todo.txt: + Flann is more and more integrated, not worth patching it out imho + + 18 Sep 2011; Andreas K. Huettel opencv-2.3.0.ebuild, +files/opencv-2.3.0-ffmpeg.patch, todo.txt: Ported the ffmpeg patch diff --cc media-libs/opencv/Manifest index 5f9cd7c,a6f22b4..f6e6dc3 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@@ -1,6 -1,6 +1,3 @@@ -------BEGIN PGP SIGNED MESSAGE----- --Hash: SHA512 -- AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322 AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6 @@@ -24,28 -23,26 +21,9 @@@ AUX opencv-2.3.0-symlink.patch 838 RMD1 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b -EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f -EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7 +EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5 +EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc -EBUILD opencv-2.3.0.ebuild 4113 RMD160 0cef49e16f56bc18c1b367105d5233b250d15f85 SHA1 2544dbf1664a6d509e0fc40251f59c02adb65bb5 SHA256 7eb3713d83e79fea7cd1c1a699005b77974e1f6232e595818683d124037a9d45 -MISC ChangeLog 8268 RMD160 349c578a91c0e8b450367db08869bf46251a29b1 SHA1 9b8d6fb8792f2b861607c89bba91ebbd2059210a SHA256 08d6e9447b08971a1234436368a52bd87891dfbae02034a8c8f3016f6aed3b4c +EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08 - MISC ChangeLog 8525 RMD160 2b89e3b492f3dbb79bea81e650526b1b67d1c081 SHA1 31a0be8c34470bf5eca428e726ba10cfc10fb840 SHA256 53d3729f105e5eb086fab237046cfa2769cf4f70dd241b3b783565339455fdff - MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2 ++MISC ChangeLog 8616 RMD160 d198ddb4f0db913dfcbf839e3269097b92fcc16c SHA1 89ae23f297ffa74711cb7e331c688a7d61d89b17 SHA256 b929556a3078baa64e97f8a81ffe718f913de081e64ab68bc31b34619fc2e569 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 - MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3fefad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c3476186dd73a3041e39e80a509541a57dc689d26b5a -------BEGIN PGP SIGNATURE----- --Version: GnuPG v2.0.17 (GNU/Linux) -- - iQIcBAEBCgAGBQJOgnxFAAoJEEb+UGWnxTyHQSMQAKR5oYBLhlsSHPDU8toUV036 - p5tDB8ljNLHbxZ6Tf6GB7gNzRww1ZFBBt0kz9tRBN8nz2ioWQLPxz5wOPK/sUsiB - BJEvLO4urdDeRmGVCOuYZxRkE5AoQFExY26praTkOeC1n5dpDryky9Po8g3Xpx8U - 87C6LyBFp5xfYWgaGLIUbyxfg7tj03gAJghfJ2lz4LOcYlcPnIvN4/swLkP3Y+ie - OgG5PD/DExqcO1KYIRpn4cMNr6moVNX702GbbHIOwfnK/eeQ5XZgI1VsXFwsszII - Yfmte87pcyM3thFRIhXpLQMdXywqryGhkMXELuWidfaQ2VEcfupRKFWNlvlSxsr0 - 0wG9pfe20U12Ls/pcJ6FjiKlV0qcWhRPVGJKzd1jpWEQ0vwhw+V+aIl29PYWT2XK - gYWCdxqd9Ny/kmKXh61z/ae/nt1KirUHAHGtVD8d3dtnYP9GADOXco+c0QBJxtAd - sbC0snmFHRZE0JobNOR8a/vbTBUxrilODiesHdrCpDiWfj9PlUhVO5pm0q/XS5la - /e8ykuL56GYRr7PSPHOPTjvFDcZ6JzCetj7qc/QFWE61YI67HaYgjVhR6QiKfZhy - CiNiVPHJ20CSbIZpax14sRE3F1gP5flAPXK57jfL6PMwjY0uAf6+ThMtGN7+3ni/ - WrXjV5Z/xmTMCMKjRj/T - =KUyM - -----END PGP SIGNATURE----- -iQIcBAEBCgAGBQJOdlOlAAoJENwGBM22xffeV4kP/RZx2kCLEgAlcytJz1FcCBLe -dwxqq3wAzfhwIYsMeJfpNPg0KhR+tvnag26OTkM5UMTspFlawCXIbn1DP3DYVZ4d -F/k8LsmbOeAIGtWkMrU1sK1Pr5yGEUxco+8nnwza0N9wFW9DtXaR8X5zjLm0OZ2c -+rWtxscroDD+pDpsYWlGVplUxEqZI7F4BhkRS8bIJ6RwLudo713prAa3gScAUa2U -K1qDe/63VyLs3XWWyTYyUz875/HLUFP5gwWdlT6CgPM2tKH+EM0FVMYWAJaPKFha -bE3p0XyC2slmEbrX3tljVVJ4pp0Gxu/u61guLfQKcyIVyIJaGPComTsLdVgG/0jt -TW9FZs7eMVhUHZndqKPzk+gnvIhvIELzB7jnMpS5IRcqBudJG3skggkoIaaRjoQc -2gOui4sdkSqH2o4dMoEjgHJftnjB/kdpyCpcAtfupQSRwwvo2/sdURz7qOrKlGR1 -tg6GhNqf9wPaOY90YFmbhIGeI73AK/mFEUn/gllOaUePQV/F3mEIdkrZo7pmCSkE -aWIVd5zJTGNgVxa5ft1FSHi7/+fX1T9c5KTYbMa/0qNLB2H3m4/x/MoxtQOBG+PO -9X3ioJFDs2vhpzqxfvY492bt1H0HhDYAIX2zJgVJW/a9NzkHLQZh94r9AAHyftfV -waMRh/DiropKKFM4Qhza -=C9tw ------END PGP SIGNATURE-----