trivial fix for bug #433708 to remove unneeded Makefiles

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 15 insertions, 4 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/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