as-needed fix for #313707, thanks to Yuri Vasilevski for the fixed patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 77 insertions, 4 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index d20d6c9f65eb..ca6963f5d56e 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.25 2010/04/07 13:09:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.26 2010/05/03 18:16:17 patrick Exp $
+
+  03 May 2010; Patrick Lauer <patrick@gentoo.org> zabbix-1.8.2.ebuild,
+  +files/zabbix-1.8.2-as-needed.patch:
+  as-needed fix for #313707, thanks to Yuri Vasilevski for the fixed patch
 
 *zabbix-1.8.2 (07 Apr 2010)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9204c3a23418..96ce345b29e9 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -21,6 +21,7 @@ AUX 1.6.6/zabbix_agentd.conf 2526 RMD160 0b4a81a0efce31c09423d0f11a674f83c42aba7
 AUX 1.6.6/zabbix_proxy.conf 4527 RMD160 0d8e266731808eed69c64e02bc5fae9068ce4f6c SHA1 c533ec42dd4f042ba7e39706bb258a743d2237b8 SHA256 6626de0c5c4199696b8ea8d2b4c6faf59ee3223ce25e41c43269f6b850bf644e
 AUX 1.6.6/zabbix_server.conf 3933 RMD160 7e0cfe262911d5a42ce590071e2852ec8d76e8ba SHA1 909836c361b2f6ee42629141f9e7678aeeb1aadb SHA256 e44defbf4036476707c8c7d1268df45117df263b188b268fb5e52931c9895ffe
 AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
+AUX zabbix-1.8.2-as-needed.patch 2328 RMD160 8a69c4b6267c0e280e0135bbd13915b5d02b6c52 SHA1 e838d87010f9105ab4c0873998575ead783ca8c3 SHA256 6ca4044ba72c7417cb7d6273582d93c4266b3528d77c1c450c12b7d013a6551e
 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29
 DIST zabbix-1.6.7.tar.gz 8396320 RMD160 0162ee8e173c895c2dfabc4a2249f480b12900f1 SHA1 0703389ef5cbb34af824e14236091d777fe38197 SHA256 7702b5c812caac39d0ff7b8d841aa1accc2ae2bc59f8229b3a5cf23b31197a3d
 DIST zabbix-1.8.1.tar.gz 3607414 RMD160 2f444b7292855bb4b9aaf4830871ebeb49e28b47 SHA1 ac8d4e73eebd1a86b9fdc5df3035df67e7efa5e0 SHA256 ef487766f22527d79fd7a2631b615c34d04103038341f1dc16eceb77172d8a7c
@@ -29,7 +30,7 @@ DIST zabbix-1.8.tar.gz 3549582 RMD160 1eba1aacb7579bf560057fe9cc1d667bf36ac608 S
 EBUILD zabbix-1.6.7.ebuild 7719 RMD160 e330d08e93ea8113277fc470405a8f1ffae1503c SHA1 feac6b3e936d072fa71d22a684cfb7f93f4a3c83 SHA256 7900725e9aa8ee43f2bb92ec788bbdec9785a3e6623946e482715c9adedb91da
 EBUILD zabbix-1.8-r1.ebuild 7960 RMD160 62453c575932f8209ac8e9481515998f195a6f4c SHA1 7d99c0015dfe65b2c95b00806875727ae1e3d30a SHA256 244a75a996f71f6bcd9312bd9ceacc6de6ca1ae322d46aa487925cb779202153
 EBUILD zabbix-1.8.1.ebuild 7959 RMD160 dde0f3da00014c850e36533957c84dfb913aa9b4 SHA1 00eafc26fd65dc962740502147d4de5808ddf19e SHA256 b39ac4cd10831e2abf7bf97628f139820923a7d99eb76592e961a40e4a5a83d3
-EBUILD zabbix-1.8.2.ebuild 7893 RMD160 80c722ee9f1b98806d56317b8250bd8820f967f4 SHA1 07e4bfce81f848a99e397830e89d52863d5f5b41 SHA256 1f0e2936ab1fec417b11a487fc3a45ff5a1e5b1832e4a6211e05d27c4646832d
+EBUILD zabbix-1.8.2.ebuild 7956 RMD160 62dfe55c7cd07eb81756555470efef755ccae4f9 SHA1 8cfb4b152285354a0b8d1fc58060568b424ea70c SHA256 473fde500ef5f2fece24a429da460057328bcce66cc860932b5103e91f92e9cb
 EBUILD zabbix-1.8.ebuild 7858 RMD160 4221cd6013b561d44b65257d116792ecf813d9bf SHA1 f16a523079e6077d7220eb33dff97576a605ba11 SHA256 9350f765d6cdc53ffb31db3fd750f1c4e2c5ceb469b30b91afb65baeb10b0b7d
-MISC ChangeLog 7500 RMD160 85de25674e00c675eb2fa57ff517a24f11cb0130 SHA1 856bfeee1d180d036e497a2d22039b299e52ce0e SHA256 43194e9c0b4df7e8395d9b90b8bfa9492f61b6036926d3a0295bbf53d5a4edfa
+MISC ChangeLog 7686 RMD160 d3867191ef274485f1be5f99392342ef19504345 SHA1 ae2f5e1187738a9885d2e2ec3ea5a75c4c5753cb SHA256 b54d745f39c8b5b4cea35cd6474900f3da06d0e139592b3b9cc9db510e023d5c
 MISC metadata.xml 876 RMD160 eaaf9df3e263aebe0a1229b6fae6ba4596fe0a4d SHA1 fdfdd13b2376b6674d65aff6b70949265ee187ee SHA256 821c5cb433694059af057e1001020f0556a609c69732b34e1326758664e545c9
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
new file mode 100644
index 000000000000..6e7f082fb4fd
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch
@@ -0,0 +1,63 @@
+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/zabbix-1.8.2.ebuild b/net-analyzer/zabbix/zabbix-1.8.2.ebuild
index fad2e5b86495..177ec15e8e61 100644
--- a/net-analyzer/zabbix/zabbix-1.8.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.2.ebuild,v 1.1 2010/04/07 13:09:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.2.ebuild,v 1.2 2010/05/03 18:16:17 patrick Exp $
 
 EAPI="2"
 
@@ -179,6 +179,11 @@ pkg_postinst() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
+
 src_configure() {
 	econf \
 		$(use_enable server) \