diff options
| author |   Alexandre PIGNÉ <alex@freesenses.net> | 2012-12-18 11:12:39 +0100 |
|---|---|---|
| committer | Alexandre PIGNÉ <alex@freesenses.net> | 2012-12-18 11:12:39 +0100 |
| commit | 2935f75e4ec2626093a557e54395679ce5ae3d14 (patch) | |
| tree | 9af22c58e60833b6eb6eaa18aaa39bc75069128b | |
| parent | Make EAPI compatible with python-r1 module (diff) | |
| parent | Only merge HTML_DOCS when doc USE flag is set (diff) | |
| download | lootr-2935f75e4ec2626093a557e54395679ce5ae3d14.tar.gz lootr-2935f75e4ec2626093a557e54395679ce5ae3d14.tar.bz2 lootr-2935f75e4ec2626093a557e54395679ce5ae3d14.zip | |
Merge branch 'master' of https://dev.netzob.org/git/netzob-gentoo
Conflicts:
dev-python/netzob/Manifest
| -rw-r--r-- | dev-python/netzob/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/netzob/netzob-0.4.0.ebuild | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dev-python/netzob/Manifest b/dev-python/netzob/Manifest index 27baf72..6f43133 100644 --- a/dev-python/netzob/Manifest +++ b/dev-python/netzob/Manifest @@ -9,5 +9,5 @@ EBUILD netzob-0.3.2_rc1.ebuild 1301 SHA256 aa0107ba1cc34246d27d79bfa7a94e342abf9 EBUILD netzob-0.3.3-r1.ebuild 1256 SHA256 9c35087500f5c8d1a9af345dc9bdc82d1be0366e19509ab25c631eca1aa8a940 SHA512 34610ff4520f0eef1152eefd7d5923688c5a2a064d9c82a2c02d02afb6e3924d795120c2572bd43098a48cdeba7b7e03ba37244a0c264b24c10ba6d0cb28e16f WHIRLPOOL d97116bdb46a41d22704583f24efb29aae07c7b5abdfb3c28f667a4c9e0e47ae6d99d743e13f1ac701de9d9df377dfa9f72d2160a3668acb1b9cc9d88d2c48c2 EBUILD netzob-0.3.3-r2.ebuild 1263 SHA256 8b102fd3531fa38807a3c92e09ddc2e2ce299df418f6c35c1bf4147a2596dd24 SHA512 3b9f75181aa5287d88d65fd0725ee715d16e6729c1f9e27e64b086b9833e64677bbd91d241a4d60d9d51ec7d1ac4592c8c311da7bf853f39cd911943a12d64a2 WHIRLPOOL 5d09cd667c600700742d3fcd22378b06819fa55c0d6687da3e88d51fe73e2aebc8238e72df5db1891347f0bf97aa70d5f4dbefc1c10ad5e7e9bd7ef6193c71a4 EBUILD netzob-0.3.3.ebuild 1256 SHA256 9c35087500f5c8d1a9af345dc9bdc82d1be0366e19509ab25c631eca1aa8a940 SHA512 34610ff4520f0eef1152eefd7d5923688c5a2a064d9c82a2c02d02afb6e3924d795120c2572bd43098a48cdeba7b7e03ba37244a0c264b24c10ba6d0cb28e16f WHIRLPOOL d97116bdb46a41d22704583f24efb29aae07c7b5abdfb3c28f667a4c9e0e47ae6d99d743e13f1ac701de9d9df377dfa9f72d2160a3668acb1b9cc9d88d2c48c2 -EBUILD netzob-0.4.0.ebuild 1224 SHA256 2510a524b5918c5c337563a742c07133948cd20bfab645fa9cca063ed9a5e306 SHA512 b6d03fbd617a1f9c726d3e89c347e90c1ddcc80a89057cdade8f657aa0b6d164627dec14108be85f5af12be9e09c87228d14fffc60a0fd3262cc082788bf8239 WHIRLPOOL 2ceba64b44c7aeab75f6267f1c5acd6e632e81b3bbc7a09f7d113e5d3bb18cfa08b62e7739adfd8c7d266eb08d9128365f095dba7396378b2dff253c94362090 +EBUILD netzob-0.4.0.ebuild 1235 SHA256 6c260414d2f53576eb81c783f4ef4b238abb210d22e1d9c752bc023b29dd236b SHA512 938ddec360e1328d8397b1d73146e7ad065ed7d564fb162a2eb8d4a37a39129c69dd966fe5e5fe63dc8933beb7900e988d6e761a43bff04b6ceb186ae51d21cf WHIRLPOOL bc29e3541c6278b0f9db8e57e2916c50e2d81a9791d8fe1512ed1aba3e5c0ae109ed798623d466ba6657750eb43adcab537f4b7dcdb36fcb14ffc712ea562f0c EBUILD netzob-9999.ebuild 1212 SHA256 f52c89845b28c80c177131ffef7ea70e5c0df904e05043f32f643bfb82eeb2a0 SHA512 c432bd7524f0cabf4b7bcda173f8606dfd37f9d55a2dc7ca8d54a63244901e1ebb0e3969820815ec54013256f27c847ee98c5be6fcebab78b3da1d146ff9847d WHIRLPOOL 99d3c416221243e77a59092a47deae3a51e005c73dc941d1a0c6ea42c8478d53ef77413352058f3fe65ff188a4a1f78d11559f1b18141d9b7c1232e54abf8884 diff --git a/dev-python/netzob/netzob-0.4.0.ebuild b/dev-python/netzob/netzob-0.4.0.ebuild index 8932b26..792d9ef 100644 --- a/dev-python/netzob/netzob-0.4.0.ebuild +++ b/dev-python/netzob/netzob-0.4.0.ebuild @@ -37,7 +37,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" DOCS=( README.rst AUTHORS.txt NEWS.rst COPYING.txt ) -HTML_DOCS=( doc/documentation/html/ ) src_compile() { distutils-r1_src_compile @@ -52,6 +51,6 @@ src_compile() { src_install() { distutils-r1_src_install - + use doc && HTML_DOCS=( doc/documentation/html/ ) doman doc/netzob.1 } |