Fixing as-needed issues #333425

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 96 insertions, 6 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 1aa4f359cf30..4fff383efd0e 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.38 2010/09/12 20:24:04 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.39 2011/01/16 11:30:10 patrick Exp $
+
+  16 Jan 2011; Patrick Lauer <patrick@gentoo.org> zabbix-1.8.3.ebuild,
+  +files/zabbix-1.8.3-as-needed.patch:
+  Fixing as-needed issues #333425
 
   12 Sep 2010; Patrick Lauer <patrick@gentoo.org> -zabbix-1.8-r1.ebuild,
   -zabbix-1.8.1.ebuild, -zabbix-1.8.2.ebuild:
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 632f40842a12..0e03cdf92aa6 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -22,8 +22,9 @@ AUX 1.6.6/zabbix_proxy.conf 4527 RMD160 0d8e266731808eed69c64e02bc5fae9068ce4f6c
 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-1.8.3-as-needed.patch 2623 RMD160 a29c220a61686296a03171fe8ef81a559f12a65c SHA1 db14bd8794331f4f15987a9343e6fbb8d6284a0c SHA256 ad9083833a44d2e729b285e485982bc0f5e4b3e7de97035255a0ec1a2828a9b1
 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29
 DIST zabbix-1.8.3.tar.gz 4106152 RMD160 f0d54c1cd8865c952945a8ec3958e7ebdd9a92d5 SHA1 68f5d1f12897bc69c6ff5deea2bad82b0c1f5761 SHA256 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c
-EBUILD zabbix-1.8.3.ebuild 8017 RMD160 0c003b2d6a73a7d7615e091a8ece77642fe0329b SHA1 82dbd1410ea500e05bec1c96e1f8756b8e827ec5 SHA256 9cd4993df6f9ca7ae6caa0cdb6a16f1e8f2d7335a3474cdae6b536351a69b4df
-MISC ChangeLog 9172 RMD160 6fd9fbfe239d1e247fd33f0ba867b59d25296b09 SHA1 3fab0d3e3eb22133bb5a8d60353acee14ca57fa2 SHA256 058f0e36f4efd5b70e933ef4cdca01835b11c3fb82df890d7ce31f0191872c5f
+EBUILD zabbix-1.8.3.ebuild 8080 RMD160 4f75e6e7b4852da9006dfc3369291a46a6dcb724 SHA1 901be9264742a30375d509247028889becc2d8ed SHA256 9771ee96ba3dc12d76705f8134ad69786ad075b61a07e7e0b1ddc5c682f3d117
+MISC ChangeLog 9317 RMD160 3ff8ec05185b47756a9b48f8c86fffa568af80c7 SHA1 696ce8072b6f71e1efd82044dbfdbccbfa359b61 SHA256 58db1f2777c39d2ce774652af42dca3606042db83bc6fb3139e0efb55f5eb85d
 MISC metadata.xml 923 RMD160 4318cea3643c9523c0bf71913d355b31954d079b SHA1 0a121546e57330503091d4c29f03de07d54f578f SHA256 1f7a69cb4461cebb0f1bc62c1a91167a2e69dc9c3640c8c4eb9488643f154c23
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
new file mode 100644
index 000000000000..33e6e65d591c
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch
@@ -0,0 +1,81 @@
+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/zabbix-1.8.3.ebuild b/net-analyzer/zabbix/zabbix-1.8.3.ebuild
index ee8e0997b3cd..23e42f90c0a8 100644
--- a/net-analyzer/zabbix/zabbix-1.8.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.3.ebuild,v 1.4 2010/09/12 16:09:28 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.3.ebuild,v 1.5 2011/01/16 11:30:10 patrick Exp $
 
 EAPI="2"
 
@@ -42,6 +42,10 @@ DEPEND="${COMMON_DEPEND}
 
 useq frontend && need_php_httpd
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
 pkg_setup() {
 	if useq server || useq proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype