trivial fix for bug #433708 to remove unneeded Makefiles

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

5 files changed, 34 insertions, 17 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 2ac3f07a33f9..2022b8d5c330 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.135 2013/10/04 19:14:10 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.136 2013/10/05 03:09:44 zerochaos Exp $
+
+  05 Oct 2013; Rick Farina <zerochaos@gentoo.org> zabbix-2.0.8.ebuild,
+  zabbix-2.0.9_rc1-r2.ebuild, zabbix-2.0.9_rc1-r3.ebuild:
+  trivial fix for bug #433708 to remove unneeded Makefiles
 
 *zabbix-2.0.9_rc1-r3 (04 Oct 2013)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6d500b2166a0..a66174976a74 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.4.6/init.d/zabbix-agentd 581 SHA256 5afaed3880c7f8d1a13d51d963f2758a0bc3ec982c667cc2aad9c84d44753452 SHA512 4d29435590d42374dc7428f09617ddbcc6e551850651f4d057a20b39689c041dcf3966b18efcec1c4478e44b9995ec3c55b1f3d3e27ba9ff5b96f0aef076da7a WHIRLPOOL 197096795bdb5387f62687b52894d86a10002a4e9bab11b28a71c3f0e575daebe6827d14b48983c9c0c3f49491a12751789ccc43e7e0e4e80ad60aac156eaf23
 AUX 1.4.6/init.d/zabbix-server 563 SHA256 8c2bc6b7dc1fb80e6b24536f7acb7ba102975b345da055cc19e33adfcdb95976 SHA512 897134b640ed2bd070fa3c29b9fdda368f6451179908fcd00aa2ee8710ea64556e6fcc1592e40a7050b323b56b67837004c1411c326ff4024f949089f980429b WHIRLPOOL e84983ddd78c29f76d8aed51b54f63db70a00637b6102cab065e36178c01f227770e19d999e0fae201ea266178221f40e141fb010f8171c787e2d78da6767372
@@ -33,19 +33,25 @@ AUX 2.0/zabbix_proxy.conf 9979 SHA256 a1fe3728322abac55d3dc62ce1b3c86daa58c7c8c5
 AUX zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 SHA512 9ba379e8088697f26f29ac31f2c5e8cad8e0709993285afe9e390f63150ec09fab46089e3f29f2d6a818bf55042c39646ce19840498355fd6df43b1834c6078d WHIRLPOOL bc4728cf9e14284b91b45627090e45d39f53a721ba46d9379418d650d22732994bec11046d64d0f0136932d4f4e2f0c29de68f527db9d9f765f0245f1d39288f
 DIST zabbix-2.0.8.tar.gz 13457936 SHA256 c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a SHA512 5a65c7fcce33d98a0f441798ca83f16bb6ed31b8a1b025f39c4003a0906c148ed5ff9db41aec591f053083b6bacd3ea1a1c8b96c007c44da092bfa179693e403 WHIRLPOOL 8ae2815014a28895689e8083f21e26f8c0afd7bb5f12a177f8487d563a889941e15db5991668c56a2dad62bf1060a77195057fea6283059a8c4dcd39ff709c05
 DIST zabbix-2.0.9rc1.tar.gz 13648577 SHA256 474ac3a0fb47a0f2dc43667948ae40fbe895ae754ae71377ff084cb33c716db3 SHA512 2d67f5850066c6c932b42a2ca371def9bbc77a52b29e8f98bb116261a94df5aa13160f45a5d5c18a856c5c61a0cdb18d73178701e1ee80e476ad6eeb36110963 WHIRLPOOL 44edc34c4b8f81899e55c4d4b9f68bf6b604df3acd15c1d1a5468c5ac2cca9394cc9091e37dfbe0ca71278aebb7d1df9e622ef799bd8e84944f391b0ff5b058b
-EBUILD zabbix-2.0.8.ebuild 10573 SHA256 0e5969036f51ec7d410a57f817752216d807da506a5ad17c674956e63f4f62dc SHA512 7e7625ea7fe731e490d0a66f12f7b40cbd71b4d262a52010f1ec2914c5e73af40127b51f983a8202f8264cae9ae56f77942d233bbb34cb53ef0cdd488f8e774e WHIRLPOOL 9fd66f46301119ac52fbe0e0145b0e33036ee12677b9532ed2cfe71934553476971cca6c857b86c8b711e5d6a52161e948ec5b9653f9870ce04b183e64dd011c
-EBUILD zabbix-2.0.9_rc1-r2.ebuild 10450 SHA256 c00c03add58f079c5dd3234832b9093222db5f1c563753795139aaf92f1486fa SHA512 4eaf5d1d9be75dc3234c9f08683fc85592923747dca2c5581dad714105c9ddeb012cefbd3308304ac9975ab7c4bb6bcfb6d93d893035ed9615823050e67d20e3 WHIRLPOOL 61f76f1bdd4ad73fdb0e94dd3b1faffddf9f5e1f6a7be2947156a226860e05fd646e8a82a7a00b85808a01eb75e179ba82dcb11456b561eb57c811620cb6bdfd
-EBUILD zabbix-2.0.9_rc1-r3.ebuild 10452 SHA256 316373d1b30adc3192da4ee81a3f412b36d44a7eb11474754a810be9d950d517 SHA512 6a980059ce0fea1370f7839d11e68d5e4eff014668abe12e3611170cfe2833a3106867d24786ecc06bf5583f81b10271ad09114b398854b01271999a6b088e46 WHIRLPOOL 31b55ebd9db8f02f1f243d24794e8ace91c3d631babed4bd7e3a85a910f9c4337769b9413d4be65beeaad995d378ddbda8b34adfb8eb7253e6d2b06cd539de79
-MISC ChangeLog 31641 SHA256 37746e9f0d81b35709f4847daee05aad9878296eecde4230704dae3b74f20a9f SHA512 ccd5accf478e1d14b01ec3f9d425944a44aae7ecf36311cb7ad097f97f3bec25af0aa69695859f480b6d5560f09fa8483ada12e5b092749dafc219b702d34585 WHIRLPOOL d8eaef2aa51d2cd5dae7abd014357fb7eaa15a9c8f4dcf6c54af4be480cd36fb7915b4d3b3b2100f7895d391ff20efb78060f214a1d3f8a37028655f8a108bb5
+EBUILD zabbix-2.0.8.ebuild 10717 SHA256 9d6e33914ced04d6c148756d1434502d3c0f977b59e51e4f3ac9cf47c3ed86c1 SHA512 88e5f1c29197adde6d539e13b735aa8f83dcb7cb2ea847a37c554d0d8bbf5d32d0c297672b8ff338bfac9c978d22a83d37ccc61abefd83faa525b7c26e331741 WHIRLPOOL 2dcb7f27e675a0b369233a3d398634f72101f6501e0d33b584d61b7034876b8c6cb4dc4f888aba9e599f23e1064dcdf934ae3aba36222ff77b22c991cd75f618
+EBUILD zabbix-2.0.9_rc1-r2.ebuild 10593 SHA256 91a9e9b4b2669cdd6824dd5c78cc65405dc32c6dd4358afe5bb374c5a182d614 SHA512 e8876499b427167b738332ad2d7d597cd90c5cd6bc6bed54605b4408cd5bc86da60ba0cbf626c64cf808a9bcc2c4b3857cb222bb688be8dacc7b414283a4b81a WHIRLPOOL 0f9653791129da31e95082b0d474bc4e2cc6e83d5176d874e0e83a69c9fa12673753234d9728788a31e86de22a1a5a2ebf6ada32975d50ac580a984c802dedf6
+EBUILD zabbix-2.0.9_rc1-r3.ebuild 10594 SHA256 feb82f836fc4fe538e4c284d8f426c5dd14862a59c63118f38187175b4737519 SHA512 cbace75dba6579bb9beee160bb5eed28903b2767b537726a25e60d7ee3b6f9aba02c661cea2b0c4c117b9e8e70fb65b1458010e7113377829ad0d4ba6d72209f WHIRLPOOL 72aaacacd9a5526d0fb6ef0fe68de6b0f137ecf10f23e55286856e54ec2b263217340817603760c8146a87dd2c7471bb9c4bfb06b79a578410a8503b5c9a3cf8
+MISC ChangeLog 31834 SHA256 6ec114d0586acb84dd5024a18df80ae90ff60533bff90ea8e6c6b188d636402b SHA512 9d876c6d7beb2aa60dae0557f82bfee92ddce749d0c43058ce47857cc2b225054cdd06c3ad8661c8a8dcbd79f98415f8dcb420786b274cc26c63655ea672cef7 WHIRLPOOL 7cb72ad8595d6946569dedc0b8919fc86374dcc93e3c5002621c442f161244c967fe220817a3822494be71c73d964c351e540824a72eb00c1093b1bd79d2c4c9
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSTxOKAAoJEC1LWXx4YDenHnYH/j8ASA/8ij8/0kaOoMU1TGhS
-J2WkwSAtbmKKRrERqmKtLx97GXTjfskWElQRaFWhGpjU27QLsTlv0BU/bnYJEQKm
-jhhcC17tM0XSNtbjxPyjkBerSZwjK6C1vXDVsusmNANVL6mFbW8rJuVZUObYM/Qu
-oOWz9ZAUf2jgjuEDtgSdk/BiaTvwZaMyEy4fS27k/XtCwCp33Zx48rFE3jzMvqlX
-w8EwxORClGzlj+Jp+fk19lo9uck2lBHHWsUc5x91DetVuk3P1FzB3UspTylXdPHF
-Q0VWEGoDK8SJ0s1p3CUQ0Usp5oEtlQnq/biDClr7Hnoq7VWGKQ0LUcpgRNUG5fU=
-=ebsp
+iQIcBAEBCgAGBQJST4OZAAoJEKXdFCfdEflK6twQAJMi8DgTkelWFKteQcuUVRlY
+OpMMTmQ/mmetbVrqavSmAdE0M2ToOOJYt4fbsP71qshm3vWg1ywOnRwssWPuhEA0
+Hwn3+Ne8Bg33x/s8DLSUQHJ/zTZvTfr2vAooi9Oe+korv4k8WJKkKvZZ3NRF04Hx
+eqjUpVPPQ2wX8UVYZhL9Plc1JeYahF/zmAluSGlFvUPYIs8/CKrmbGHzetQI/x5W
+o4P3B4W1Xzo0gaTlImEFsy8f6Sb+ui43B1UCUylx7na8sNcOKDe9shJ6y2bAEu0J
+KQUeaxtNzC+RzNrXvhkceBULcNmkq1Tm8YBCERiD6c5IuVE8Gr+3ojXAaLxGn5sB
+e4wErMYt+lht6vUKA1VptAyIF1Ywy4Vh/avzV+q766dDcyiArnTnh05IDbsd3zR9
+3Va0GHuU5cfBPOyrtDfepk+vPM5Im9Cf5NGO6e3O6sFKSazTYGUKX+S0CWUZgUCh
+Z09RU+PoQ6x2YV0LIAdPQAqoC9MPOiY54WiXD0brJXVD22rIp8zpMqJbnsocOFLW
+lfxX8hTlewayScSzNFi22b8kewxeZ/YMIFpSPeM/38whE9YE9bPsOEdClbADiUJj
+DUvU8HDo0Sywz5Hco7pGfa6hBrR4f9cfSDAmcBQWcD6jhed065G0xyjYm9Lv4G+g
+kTvKntrdo1ziAhkIWZ4/
+=wQqJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-2.0.8.ebuild b/net-analyzer/zabbix/zabbix-2.0.8.ebuild
index e340cf0ea090..3ab1c92e7b6b 100644
--- a/net-analyzer/zabbix/zabbix-2.0.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.8.ebuild,v 1.3 2013/09/22 06:49:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.8.ebuild,v 1.4 2013/10/05 03:09:44 zerochaos Exp $
 
 EAPI="5"
 
@@ -287,6 +287,8 @@ src_install() {
 		doins -r \
 			database \
 			upgrades
+		#remove unneeded files left over from wholesale copy (bug #433708)
+		rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am}
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf
diff --git a/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild
index 0afe95a33e9f..bc87d40aab13 100644
--- a/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild,v 1.1 2013/10/03 08:15:06 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1-r2.ebuild,v 1.2 2013/10/05 03:09:44 zerochaos Exp $
 
 EAPI="5"
 
@@ -285,6 +285,9 @@ src_install() {
 		doins -r \
 			database \
 			upgrades
+		#remove unneeded files left over from wholesale copy (bug #433708)
+		rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am}
+
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf
diff --git a/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild
index df09009ad698..fbaab884ad45 100644
--- a/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild,v 1.1 2013/10/04 19:14:10 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.9_rc1-r3.ebuild,v 1.2 2013/10/05 03:09:44 zerochaos Exp $
 
 EAPI="5"
 
@@ -285,6 +285,8 @@ src_install() {
 		doins -r \
 			database \
 			upgrades
+		#remove unneeded files left over from wholesale copy (bug #433708)
+		rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am}
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf