Keywording 1.8.11 as testing for amd64/x86, removing legacy unneeded patches

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 12 insertions, 210 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 3fbdc2c965dd..d65f53cfca49 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.80 2012/03/21 02:12:53 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.81 2012/03/21 06:01:49 mattm Exp $
+
+  21 Mar 2012; Matthew Marlowe <mattm@gentoo.org>
+  -files/zabbix-1.8.2-as-needed.patch, -files/zabbix-1.8.3-as-needed.patch,
+  zabbix-1.8.11.ebuild, -files/zabbix-as-needed.patch:
+  Removed legacy unused patches
+
+  21 Mar 2012; Matthew Marlowe <mattm@gentoo.org> zabbix-1.8.11.ebuild:
+  zabbix-1.8.11 ebuild working fine on dev boxes, pushing out to testing on
+  amd64 and x86 arches
 
   21 Mar 2012; Matthew Marlowe <mattm@gentoo.org> zabbix-1.8.11.ebuild:
   1.8.11 seems to no longer require the as-needed patch as all the automake
diff --git a/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch
deleted file mode 100644
index 6e7f082fb4fd..000000000000
--- a/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naurp zabbix-1.8.2.orig/configure.in zabbix-1.8.2/configure.in
---- zabbix-1.8.2.orig/configure.in	2010-03-29 11:22:46.000000000 -0600
-+++ zabbix-1.8.2/configure.in	2010-04-07 12:00:49.170918155 -0500
-@@ -1077,6 +1077,7 @@ if test "x$want_ldap" = "xyes"; then
- fi
- CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
- LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
-+LIBS="${LIBS} ${LDAP_LIBS}"
- 
- found_iconv="no"
- dnl Check for libiconv [by default - skip]
-@@ -1100,6 +1101,7 @@ if test "x$want_openipmi" = "xyes"; then
- fi
- CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"
- LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"
-+LIBS="${LIBS} ${OPENIPMI_LIBS}"
- 
- RANLIB="ranlib"
- AC_SUBST(RANLIB)
-diff -Naurp zabbix-1.8.2.orig/m4/ldap.m4 zabbix-1.8.2/m4/ldap.m4
---- zabbix-1.8.2.orig/m4/ldap.m4	2010-03-29 11:22:43.000000000 -0600
-+++ zabbix-1.8.2/m4/ldap.m4	2010-04-07 12:00:49.170918155 -0500
-@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
-                fi
- 
-                LDAP_CPPFLAGS=-I$LDAP_INCDIR
--               LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS"
-+               LDAP_LDFLAGS="-L$LDAP_LIBDIR"
-+               LDAP_LIBS="-lldap -llber $LDAP_LIBS"
- 
-                found_ldap="yes"
-                AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
-@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
- 
-   AC_SUBST(LDAP_CPPFLAGS)
-   AC_SUBST(LDAP_LDFLAGS)
-+  AC_SUBST(LDAP_LIBS)
- 
-   unset _libldap_with
- ])dnl
-diff -Naurp zabbix-1.8.2.orig/m4/openipmi.m4 zabbix-1.8.2/m4/openipmi.m4
---- zabbix-1.8.2.orig/m4/openipmi.m4	2010-03-29 11:22:43.000000000 -0600
-+++ zabbix-1.8.2/m4/openipmi.m4	2010-04-07 12:00:49.170918155 -0500
-@@ -68,7 +68,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
- #               fi
- 
-                OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
--               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix"
-+               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR"
-+               OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix"
- 
-                found_openipmi="yes"
-                AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])
-@@ -85,7 +86,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
-   fi
- 
-   AC_SUBST(OPENIPMI_CPPFLAGS)
--  AC_SUBST(OPENIPMOPENIPMIFLAGS)
-+  AC_SUBST(OPENIPMI_LDFLAGS)
-+  AC_SUBST(OPENIPMI_LIBS)
- 
-   unset _libopenipmi_with
- ])dnl
diff --git a/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch
deleted file mode 100644
index 33e6e65d591c..000000000000
--- a/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 90b086b4daebf61756e3d6f8926cf8951a2fc96a Mon Sep 17 00:00:00 2001
-From: Vladimir V. Kamarzin <vvk@altlinux.org>
-Date: Fri, 22 Oct 2010 17:47:01 +0600
-Subject: [PATCH 1/2] Fix linking with ldap libs
-
-Move "-lldap -llber" from LDAP_LDFLAGS to LDAP_LIBS and include them to
-LIBS
----
- configure.in |    1 +
- m4/ldap.m4   |    4 +++-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index d3d981b..b11b2ee 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1221,6 +1221,7 @@ if test "x$want_ldap" = "xyes"; then
- fi
- CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
- LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
-+LIBS="${LIBS} ${LDAP_LIBS}"
- 
- found_iconv="no"
- dnl Check for libiconv [by default - skip]
-diff --git a/m4/ldap.m4 b/m4/ldap.m4
-index 29e97cd..885b3e0 100644
---- a/m4/ldap.m4
-+++ b/m4/ldap.m4
-@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>
-                fi
- 
-                LDAP_CPPFLAGS=-I$LDAP_INCDIR
--               LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS"
-+               LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS"
-+               LDAP_LIBS="-lldap -llber $LDAP_LIBS"
- 
-                found_ldap="yes"
-                AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
-@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>
- 
-   AC_SUBST(LDAP_CPPFLAGS)
-   AC_SUBST(LDAP_LDFLAGS)
-+  AC_SUBST(LDAP_LIBS)
- 
-   unset _libldap_with
- ])dnl
--- 
-1.7.3.1
-
-From f6378e6aeb0bec1883a83c70c8cdfd1213f11f97 Mon Sep 17 00:00:00 2001
-From: Vladimir V. Kamarzin <vvk@altlinux.org>
-Date: Fri, 22 Oct 2010 17:49:16 +0600
-Subject: [PATCH 2/2] m4/ax_lib_postgresql.m4: move -pq from POSTGRESQL_LDFLAGS to POSTGRESQL_LIBS
-
----
- m4/ax_lib_postgresql.m4 |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4
-index fe06f66..934d12c 100644
---- a/m4/ax_lib_postgresql.m4
-+++ b/m4/ax_lib_postgresql.m4
-@@ -84,7 +84,8 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
-             AC_MSG_CHECKING([for PostgreSQL libraries])
- 
-             POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`"
--            POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
-+            POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`"
-+            POSTGRESQL_LIBS="-lpq"
- 
-             POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
- 
-@@ -179,4 +180,5 @@ PQserverVersion(conn);
-     AC_SUBST([POSTGRESQL_VERSION])
-     AC_SUBST([POSTGRESQL_CPPFLAGS])
-     AC_SUBST([POSTGRESQL_LDFLAGS])
-+    AC_SUBST([POSTGRESQL_LIBS])
- ])
--- 
-1.7.3.1
-
diff --git a/net-analyzer/zabbix/files/zabbix-as-needed.patch b/net-analyzer/zabbix/files/zabbix-as-needed.patch
deleted file mode 100644
index 36a56d9e88c0..000000000000
--- a/net-analyzer/zabbix/files/zabbix-as-needed.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naurp zabbix-1.8.orig//configure.in zabbix-1.8/configure.in
---- zabbix-1.8.orig//configure.in	2009-12-07 13:43:58.000000000 -0600
-+++ zabbix-1.8/configure.in	2010-02-16 15:23:47.975288173 -0600
-@@ -1093,6 +1093,7 @@ if test "x$want_ldap" = "xyes"; then
- fi
- CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
- LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
-+LIBS="${LIBS} ${LDAP_LIBS}"
- 
- found_iconv="no"
- dnl Check for libiconv [by default - skip]
-@@ -1116,6 +1117,7 @@ if test "x$want_openipmi" = "xyes"; then
- fi
- CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"
- LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"
-+LIBS="${LIBS} ${OPENIPMI_LIBS}"
- 
- RANLIB="ranlib"
- AC_SUBST(RANLIB)
-diff -Naurp zabbix-1.8.orig//m4/ldap.m4 zabbix-1.8/m4/ldap.m4
---- zabbix-1.8.orig//m4/ldap.m4	2009-12-07 13:43:56.000000000 -0600
-+++ zabbix-1.8/m4/ldap.m4	2010-02-16 15:19:53.961978203 -0600
-@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
-                fi
- 
-                LDAP_CPPFLAGS=-I$LDAP_INCDIR
--               LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap $LDAP_LIBS"
-+               LDAP_LDFLAGS="-L$LDAP_LIBDIR"
-+               LDAP_LIBS="-lldap $LDAP_LIBS"
- 
-                found_ldap="yes"
-                AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
-@@ -91,6 +92,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
- 
-   AC_SUBST(LDAP_CPPFLAGS)
-   AC_SUBST(LDAP_LDFLAGS)
-+  AC_SUBST(LDAP_LIBS)
- 
-   unset _libldap_with
- ])dnl
-diff -Naurp zabbix-1.8.orig//m4/openipmi.m4 zabbix-1.8/m4/openipmi.m4
---- zabbix-1.8.orig//m4/openipmi.m4	2009-12-07 13:43:56.000000000 -0600
-+++ zabbix-1.8/m4/openipmi.m4	2010-02-16 15:21:53.618633050 -0600
-@@ -68,7 +68,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
- #               fi
- 
-                OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
--               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix"
-+               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR"
-+               OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix"
- 
-                found_openipmi="yes"
-                AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])
-@@ -85,7 +86,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
-   fi
- 
-   AC_SUBST(OPENIPMI_CPPFLAGS)
--  AC_SUBST(OPENIPMOPENIPMIFLAGS)
-+  AC_SUBST(OPENIPMI_LDFLAGS)
-+  AC_SUBST(OPENIPMI_LIBS)
- 
-   unset _libopenipmi_with
- ])dnl
diff --git a/net-analyzer/zabbix/zabbix-1.8.11.ebuild b/net-analyzer/zabbix/zabbix-1.8.11.ebuild
index e607db065ad8..30997d20e253 100644
--- a/net-analyzer/zabbix/zabbix-1.8.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.11.ebuild,v 1.2 2012/03/21 02:12:53 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.11.ebuild,v 1.3 2012/03/21 06:01:49 mattm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite"
 
 COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )