Adjust dep on xulrunner as it requires 1.9, fix libdl linkage by using portability eclass to link it only on linux, add a merge of various upstream commits to build on BSD and be more POSIX compliant and eventually keyword it ~x86-fbsd, bug #268529

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

5 files changed, 103 insertions, 13 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 0a35cf30c483..d7cfeeb39873 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.6 2009/05/14 21:29:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.7 2009/05/15 08:59:19 aballier Exp $
+
+  15 May 2009; Alexis Ballier <aballier@gentoo.org> libproxy-0.2.3.ebuild,
+  +files/libproxy-0.2.3-fbsd.patch,
+  files/libproxy-0.2.3-fix-as-needed-problem.patch:
+  Adjust dep on xulrunner as it requires 1.9, fix libdl linkage by using
+  portability eclass to link it only on linux, add a merge of various
+  upstream commits to build on BSD and be more POSIX compliant and
+  eventually keyword it ~x86-fbsd, bug #268529
 
   14 May 2009; Gilles Dartiguelongue <eva@gentoo.org> libproxy-0.2.3.ebuild,
   +files/libproxy-0.2.3-implicit-declaration.patch:
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 7ff89e925f15..dcb53dec4359 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libproxy-0.2.3-fix-as-needed-problem.patch 570 RMD160 1ebdc1552919bea0ad62108e1ac3fc60a3b70a8c SHA1 c453c230a787ac9f7f9803329962a807fb2a0b14 SHA256 9b00f329db1ad6b398be47cee0eb32e34052bc2b589b7e57b92023c7b33c609e
+AUX libproxy-0.2.3-fbsd.patch 2316 RMD160 961c67621cb34a3f08904d362bd76fbb754a928c SHA1 ca2ae2649f69f5b0988d0b06d1771befce074cc0 SHA256 c07673422ba2592c6092914c92fa932702838ddf0ac5345fb7785b624e66121d
+AUX libproxy-0.2.3-fix-as-needed-problem.patch 574 RMD160 dfd95508caf9a19a73fac5b12cc43fa697c91abd SHA1 63ff8823cedb350d7cd0a3ed26886c1079dddd18 SHA256 9bbc0275b1a78db7ba4966c8169af1269154dc3d9bf716035ba193861bf4869d
 AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
 AUX libproxy-0.2.3-fix-libxul-cflags.patch 960 RMD160 16c5c40040fb81821914ff18e79560d828d57693 SHA1 08c3d1e983d313969905c1c40bf5f3e680020283 SHA256 5b91ca5403f9827d6961b31caf1a730f603e54b209b755514411a4505ef838ec
 AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1ff8f68b95b2e57155 SHA1 842170203e449b6fcd704fa1183956d1a079bab8 SHA256 0d21b238b2476920c4fcdcff238526ddac4ab3022d359a918aab0e3315f105a4
 AUX libproxy-0.2.3-implicit-declaration.patch 206 RMD160 12d2d0507a2d0c163b7c2d16d7d42ab5d0d7eb8f SHA1 b17dabc232bf9140629a5d987279800b3d2d19d8 SHA256 1ff409011d9a826999dd1478632a5ac18f793bb3d0028e83f89f78463ee88bf5
 DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
-EBUILD libproxy-0.2.3.ebuild 2139 RMD160 235cc3102a0095af28cfc4987f6b6214718c7e15 SHA1 3c8d07b668775b93624539dafcbaa0881f3ddf5b SHA256 8d46e0496ffa3e5407376dfea05d3228123f0fbbf54b035f7fa96b154adcde30
-MISC ChangeLog 1365 RMD160 838fb50ece8151e110fcf83fd543b454db2258e3 SHA1 ff5f0963388d85149cf5f07a7263039560f75e07 SHA256 7b72238c0588e402af19abfc526962629a96efd8bd1e52d22cb99c831abcaf3d
+EBUILD libproxy-0.2.3.ebuild 2308 RMD160 3f0d3c00fb38ff46b18fc6ce0c8cfcc014f95aaf SHA1 4133d677842a1e8fd3fbd360b09884bc2c12848d SHA256 6bb67220b345aff7b38188595ae46c2d7ae4f3e46e1f9946021b28ca4ade28cc
+MISC ChangeLog 1791 RMD160 d8427822d6b3077f3102e02afc3ad59ab89f1c0d SHA1 df5582d6f27fbeb84421e0e60364bf361141c579 SHA256 bef4dc5c0cdf2bef32e03c5d9510926c24a2db56f9ae58a45ba4b476d487adc8
 MISC metadata.xml 582 RMD160 333479b481893ba9bf6aff3d2b36e3ed676ab7e8 SHA1 0a267d1e753216b35fee81b47793be3e62d3dd75 SHA256 f71eab2416b0db74fbae2c452b485a8d5b19dd7a3e6638e29790c18a22049a26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoMjUIACgkQ1fmVwcYIWAaN/wCdF9c82xYe7H78JdrwENHRem7z
-8aQAoOp0ZYQuZGhZ8dKbc+1EvV89j2E7
-=MiQd
+iEYEARECAAYFAkoNLuwACgkQvFcC4BYPU0qTiwCeIsJNguEcVVkTel75JWJbocOk
+KXMAn2GZ42Odiqbggy42SpLFjRYjRr6s
+=q+Mq
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch b/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
new file mode 100644
index 000000000000..8379b3997f45
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
@@ -0,0 +1,75 @@
+Mix of various upstream commits to build on FreeBSD and be more POSIX compliant.
+Drop at next bump.
+
+
+Index: src/lib/url.c
+===================================================================
+--- src/lib/url.c	(revision 308)
++++ src/lib/url.c	(revision 309)
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include "misc.h"
+ #include "url.h"
+Index: src/lib/proxy_factory.c
+===================================================================
+--- src/lib/proxy_factory.c	(revision 308)
++++ src/lib/proxy_factory.c	(revision 309)
+@@ -27,6 +27,7 @@
+ #include <math.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #include <pthread.h>
+ 
+ 
+Index: src/plugins/pacrunner_webkit.c
+===================================================================
+--- src/plugins/webkit.c	(revision 335)
++++ src/plugins/webkit.c	(working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+ 
+Index: src/plugins/pacrunner_mozjs.c
+===================================================================
+--- src/plugins/mozjs.c	(revision 335)
++++ src/plugins/mozjs.c	(working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+ 
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 334)
++++ configure.ac	(revision 335)
+@@ -199,7 +199,7 @@
+ AC_TYPE_SIZE_T
+ PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
+ AC_SUBST(PLUGINDIR)
+-CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
++CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=200112L"
+ 
+ ### Checks for library functions.
+ AC_FUNC_MALLOC
+Index: src/bin/Makefile.am
+===================================================================
+--- src/bin/Makefile.am	(revision 318)
++++ src/bin/Makefile.am	(revision 319)
+@@ -3,5 +3,4 @@
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+ proxy_CFLAGS  = -I$(top_srcdir)/src/lib
+-proxy_LDFLAGS = -ldl
+ proxy_LDADD   = ../lib/libproxy.la
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
index 9dca639de6c8..55fec42b39c4 100644
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
@@ -6,7 +6,7 @@ diff -Naur libproxy-0.2.3.orig/src/lib/Makefile.am libproxy-0.2.3/src/lib/Makefi
  						misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h
  libproxy_la_CFLAGS  = -Wall
 -libproxy_la_LDFLAGS = -lm
-+libproxy_la_LDFLAGS = -lm -ldl
++libproxy_la_LDFLAGS = -lm $(LIBDL)
  
  include_HEADERS     = proxy.h
  
diff --git a/net-libs/libproxy/libproxy-0.2.3.ebuild b/net-libs/libproxy/libproxy-0.2.3.ebuild
index e83013ab374b..9b634e3e03d3 100644
--- a/net-libs/libproxy/libproxy-0.2.3.ebuild
+++ b/net-libs/libproxy/libproxy-0.2.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3.ebuild,v 1.5 2009/05/14 21:29:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3.ebuild,v 1.6 2009/05/15 08:59:19 aballier Exp $
 
 EAPI="2"
 
-inherit autotools eutils python
+inherit autotools eutils python portability
 
 DESCRIPTION="Library for automatic proxy configuration management"
 HOMEPAGE="http://code.google.com/p/libproxy/"
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86 ~x86-fbsd"
 IUSE="gnome kde networkmanager python webkit xulrunner"
 
 RDEPEND="
@@ -26,7 +26,7 @@ RDEPEND="
 	networkmanager? ( net-misc/networkmanager )
 	python? ( >=dev-lang/python-2.5 )
 	webkit? ( net-libs/webkit-gtk )
-	xulrunner? ( net-libs/xulrunner )
+	xulrunner? ( >=net-libs/xulrunner-1.9 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19"
@@ -47,6 +47,8 @@ src_prepare() {
 	# Fix implicit declaration QA, bug #268546
 	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
 
+	epatch "${FILESDIR}/${P}-fbsd.patch" # drop at next bump
+
 	# Fix test to follow POSIX (for x86-fbsd)
 	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
 
@@ -65,8 +67,12 @@ src_configure() {
 		$(use_with python)
 }
 
+src_compile() {
+	emake LIBDL="$(dlopen_lib)" || die
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed!"
+	emake DESTDIR="${D}" LIBDL="$(dlopen_lib)" install || die "emake install failed!"
 	dodoc AUTHORS NEWS README ChangeLog || die "dodoc failed"
 }