fix minor dependency

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ed29bddd9cf4c2ada30be0e48395d7e9047fe246..139947349c5d1ab76b50999e971acab614fe811c 100644 (file)
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.141 2015/04/12 19:15:40 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.142 2015/04/12 20:55:34 bircoph Exp $
+
+  12 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild:
+  Depend on shadow conditionally.
 
 *root-6.02.05-r2 (12 Apr 2015)
 

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 6e75507b73cf862a3ff9f65bf14664dec5b1d98b..90c6a5bcc0a17ce66dd0eec8d1bd4c33ce86db4a 100644 (file)
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -40,23 +40,23 @@ DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc
 EBUILD root-5.32.03-r2.ebuild 11346 SHA256 2431e382432c6cb26f556cc800c942fd0da3eb4bbe134e9fc4715074798d753f SHA512 064c484c73010598cbfa3664b6d004c33ea0766b31a39c4a59ce0a1cfc4f06f168488e4b8c9e524e1500e3d7584a51ab87f0ff82df92feff670e6b4b11266846 WHIRLPOOL 579ae021c54867895a4c627f1e06a3bba81e9d8fe84a97af3df506b485ce31b05e667b7aec940572d100b010f5d079f8ad32035185841d5eed170a97b0b81a43
 EBUILD root-5.34.26.ebuild 12334 SHA256 1c4670f87bdf5a54513f2f5763336ae477a44f59638aff02ee4c14360b45766d SHA512 6b0b083017e89f8e54c1484e898d6a25398f31e3dc7188f3013935733a2b55debf562d38a844d4f4b3fe6e534d1558a41f2cd712153d8e3c5e7922ab9394c1ae WHIRLPOOL 803ca628ad14f315743ceff94254ea6099de100f2f487ec4400a60c2dd2862a7e9c32eda30ccccb7b520410d3171886315410466b9556d86499f22c7ed437581
 EBUILD root-5.34.28.ebuild 12288 SHA256 aed20b8908745211b7d2af7e1f867a267badb77687026a82ed1a69399dc531d7 SHA512 804d48027eab7502b7d8b032fe94df7f9c470ebac1683fdf02a0da20badbc7410daf31a272082bc4e985bf67c455ea2d87bf9996da7d145f64f9534695dbbb95 WHIRLPOOL f2669f6933c85adf46b4ec7a7355dd59edf266913c2fd7e194627a77be0d7a6e37b6767a40e3f225512efbfe1625af1f5a1f19eb5ea614a119c85a23130f4420
-EBUILD root-6.02.05-r2.ebuild 14379 SHA256 f85625e3aba2c13c2af480d431610a345a66c631fba7f8b12c75d9dbecc0b021 SHA512 33e73b71e1a56745ab8d0fa36fe0b82caceca8a5628a21aef67aa1dd00283fc6b63158d3c264c4e6b7874871c6cf97702643a111261766147c1b5b141a769631 WHIRLPOOL 3e540244ddbece942512dcae3e2a7f8820ad73a65aebd4a71c8d7677bd3497fc03f058a62b2a7a87a21f78e189733e8d43e1026b352f79123cbc3bdb4dd55dca
-MISC ChangeLog 41680 SHA256 5979208e1f32c391d9af3f32296d59d13574d476776312335d72905993513e92 SHA512 8ca8a8d9877f35764b4616be8815136ab4215d6e99831e8a1a975eb1a617034663d1ceedbf3efdbd647f71b50a1ee1b82e2bdf8db3aec26ebae5d61842beed4a WHIRLPOOL 67efaeba04ac379bad0683e901c71fbfdf4463a9745902992e3d99047eaf43d498e3d5dbcc0df939cddf5b3735fbbc3512e77ccc2f518fe9da9e5dc4a0e28799
+EBUILD root-6.02.05-r2.ebuild 14391 SHA256 bba173ca4359fceef6acea871fb7651545ef71eb70b0737db9716465ef4a6822 SHA512 2c48fc3239c6d905b922106e0e0779624a72e23dfcaf3b82ef57e20c285045a6a0f49f44456a247cb7119860ddcda0e9cf8c7cb1d5e73eff7be2663a5e4cb4ad WHIRLPOOL bfdc1bbc0ca13edae1a5ba9272c87d4948456f5c9d3eb5cae88214c5acc76d4885b0f0695df6fa580ef004e8093dc9f5de151a10b80d7ad16d10c7732eff51c5
+MISC ChangeLog 41792 SHA256 e29d45d0b47c3e035adc13dae4e018aff2e4e77bf9f003d85c19299794291d7e SHA512 c33ec2360d3393614df129ffa0019401703d591fe0f14249cf2ad25a1177c7f15928e887732e83227d6fd61e5f47631df18bcb0fc15a83c764234ca3948571eb WHIRLPOOL bd83b58fd5e3c3ddd7f77e6cf09fa3ab91d18598f4ba5b4f4e3cadef3a41c9eeed26b48b686d70df3bc8e301550835008408b2380c0d95883a7043d14854e3fe
 MISC metadata.xml 2037 SHA256 782a0418ce7592d98fb0a0ea39acb4fdda34c8e5693916203c7603c2a6949d82 SHA512 2dd71edf2ef82897be6d4f7cf5454ae26c5c1aaeeca158828b79e67367f16de280c67dd26a20e783bbcb1005f5b190166ccb119abbf0b417bed69e58d6169923 WHIRLPOOL a82e8e4a80f3d5994c42137c46bc59267b64ffb89cf66f22a4803608d53cca56b763f66895ae8efc6150f747ea45f0c00905272a9c52c7f5381930509343728c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKsRdAAoJEPZTWjO6HuSNDD8QALer4JfL/ozgdJKi+Anue6Q3
-MLeEd579nyGRh4xejM0WSKezWTZvBDjyhTtG/l2H5ut6AANXvmsir2pkC2K5PiDL
-bLK76xs7eSZmAOd6xpfBMEaPyC0hYC4NulPrEibrY3hfgM+qlxAuipzfI4qUd7Pl
-pBil5Q0fucp2Bc8ohyZuxFAbMQGEGItFvKDc8/99S04+TIJF37yNq6Cx17di7CZp
-H63xkjzTFsVxPAJqAkQNwrlF7P0gOMJyKLrDlcIXRNBhUCBWj3A3ZLqK+pFF7TLp
-1HHhKdZrEBPOX73Xo//SJbd1y/JENrCSemg80K12mksZIflKUF6naXQyUVlC5wnh
-Z7CxJK4wITzNxvJydJen8InrYzWgVbORYHq649yLfo+R7MenfmB9OqZFzYiG2LGT
-YDLOTPTHiAhgc9yOh27/xZZicT93kmQ0wPaSkFlwbY49bd513ehMWs7ImCkWPV1L
-DBm4e7YTgDLC1Yh4Sl/HzKIoQoMCfi2OYCXAL7mtksm0mYO7jlnuukCU1t3KnmQc
-flEbh0NsHEfjKY0X3Dlo2Wp+EJOPzrJP65TGjn9I6dJ8Fn07eVpw99Nn+M9I2ua9
-Qb5kaqdDHMY76l8LiG8YXSa6wJIiKdhhzj3b4bkdrrYLk1h0HJ7llGm89CINzhjN
-F9bhJIFjWUjxFntBz66X
-=eTwb
+iQIcBAEBCAAGBQJVKtvIAAoJEPZTWjO6HuSN/gIP/Rv2mhIO1JfR4bXoaMFdLS24
+AI1YXnAq3oNKWPk9eRcEQP8lu0/87fym5u6MMewMaL2icLCFfLCORTOncDh6bD4i
+cw2CFZeRt3HilbqUBqIj4iMO0ukzcxfPVXgCdmo9tBUl1LP0A2IAuxCE4+waVIAb
+Na4fNWW/e2mWR0LhZxrtShn8iah2lssfTYf08McLpe7pm0sOjhMWHsmc2CMUOOzQ
+ndnVisvxYANP3+IZaJOL08dtY/wWkP8+inMsJX3F9bvVyRKKp5JqB3EiuCp9KO4B
+7dzpIzqcW5RxfqR/QS4+qgVwS9bJgjfTxd6+x+XWzajvv5YTTXKWdGHLrpEVpu1q
+nPfly0gjuD9rl4hKr4jRJAn6QUgAl2HsKBTZZSSJYGyz8TjDrUPdWOHryeozl/1p
+1AYGHKygBEq/SQl4OH+1sEueVUvyFMXdkG/S1LuSywcEmb1UyQfzHLVd74dWKMgS
+5PZvVYV0GR/fIKUBpgg5nt517ob6CZ3PUP+MC/03RH1m29zDnP6UNISl7tfCIVqn
+09yNzEnbN55zneBaIoamxIeKZl7/cyMAkxMsytHI5HkZMJqGWGfArlQTS/YDBspF
+OAt7qE9YBwxSrqUiZI9k1Pv7ZME/CWSmCm4Q4hBpriQnZQ60xAGby9J8l/9sZfZ2
+VOs2P3TjncfpFbLQOUdV
+=U+Lz
 -----END PGP SIGNATURE-----

diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
index ef93e073b25c6db90e59c39dae9418ed958bb1f3..f9b91a5c095dba909a798d1b7ef6690dc1b82b0a 100644 (file)
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v 1.1 2015/04/12 19:15:40 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v 1.2 2015/04/12 20:55:34 bircoph Exp $
 
 EAPI=5
 
@@ -48,7 +48,6 @@ CDEPEND="
        media-libs/libpng:0=
        >=sys-devel/clang-3.4:=
        sys-libs/zlib:0=
-       virtual/shadow
        X? (
                media-libs/ftgl:0=
                media-libs/glew:0=
@@ -92,6 +91,7 @@ CDEPEND="
        pythia6? ( sci-physics/pythia:6= )
        pythia8? ( >=sci-physics/pythia-8.1.80:8= )
        python? ( ${PYTHON_DEPS} )
+       shadow? ( virtual/shadow )
        sqlite? ( dev-db/sqlite:3= )
        ssl? ( dev-libs/openssl:0= )
        xml? ( dev-libs/libxml2:2= )
@@ -308,9 +308,9 @@ src_configure() {
                --disable-builtin-ftgl
                --disable-builtin-freetype
                --disable-builtin-glew
+               --disable-builtin-lzma
                --disable-builtin-pcre
                --disable-builtin-zlib
-               --disable-builtin-lzma
                --disable-werror
                --enable-explicitlink
                --enable-shared