bumped net-libs/libproxy to latest ~ (0.2.3-r2)

4 files changed, 184 insertions, 0 deletions

diff --git a/metadata/cache/net-libs/libproxy-0.2.3-r2 b/metadata/cache/net-libs/libproxy-0.2.3-r2
new file mode 100644
index 000000000..f58bb5508
--- /dev/null
+++ b/metadata/cache/net-libs/libproxy-0.2.3-r2
@@ -0,0 +1,22 @@
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9[lib32?] ) !xulrunner? ( seamonkey? ( www-client/seamonkey[lib32?] ) ) >=dev-util/pkgconfig-0.19 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9[lib32?] ) !xulrunner? ( seamonkey? ( www-client/seamonkey[lib32?] ) ) sys-apps/abi-wrapper
+0
+http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz
+
+http://code.google.com/p/libproxy/
+LGPL-2.1
+Library for automatic proxy configuration management
+alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+alternatives autotools base eutils libtool multilib multilib-native portability python toolchain-funcs
+gnome kde networkmanager python seamonkey webkit xulrunner lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index f37922c85..3adf1e1f1 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,5 +1,6 @@
 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-automagic-mozjs.patch 2332 RMD160 f89abdb6fb1cf7fb5682e6440bb1c489ede270f4 SHA1 88239372df7fd3c5dadf1f0bc0f61fc9163f250d SHA256 52691a7a910655a3c5c0015038311a325885b1552d94ee67d60bc8a138e197fe
 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-mozjs-cflags.patch 770 RMD160 f261942d1328dafae7313add34b493d3024bd09d SHA1 9583d25a074b68e43efd97af8bc1282a007e1bb6 SHA256 3495d5abd7da88dca2da22e1d0e409cd2f6f6030a8feeb9462ac47fbd2b55130
@@ -7,4 +8,5 @@ AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1
 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-r1.ebuild 2504 RMD160 95eb8354440a2eeba58fadb6864ed5dbfefa79b2 SHA1 4e4ceb4f7a63bf8b59c05ec9d8f520ed1f18fe1c SHA256 ed74b0ab57d8dc4f4d6f8885067043deda9f8bbe85592ac28b7076ae313064d6
+EBUILD libproxy-0.2.3-r2.ebuild 3008 RMD160 bf2c78cc434467fe8114f66f21dcddcc2ccfd579 SHA1 c7136cbe9ab83632580170b231d11562df23ada3 SHA256 361e4fd422fc3adcfe070f9ccb7388bdff319a47b491b9af1c514153dd7df012
 EBUILD libproxy-0.2.3.ebuild 1960 RMD160 69a9e8efdd37a09f1d28f33b4ec80072d816593e SHA1 675b4a05c79d193ef5a09b068a03bd0c596fa461 SHA256 4a0f8cde1b11b8a076310a49b44fd96a7d8b7b4f89ce08456445cf309c43b7a4
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch
new file mode 100644
index 000000000..779591487
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch
@@ -0,0 +1,60 @@
+--- configure.ac.orig	2009-06-29 11:15:29.169464423 +0300
++++ configure.ac	2009-06-29 11:16:03.963593002 +0300
+@@ -17,9 +17,6 @@
+ PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no)
+ PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no)
+ PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no)
+-PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
+-		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+-		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+ 					have_networkmanager=yes, have_networkmanager=no)
+ PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
+@@ -111,24 +108,32 @@
+ 
+ # Mozilla Javascript
+ AC_ARG_WITH([mozjs],
+-            [AS_HELP_STRING([--with-mozjs],
+-            [build Mozilla JavaScript PAC runner plugin @<:@automatic@:>@])],
++            [AS_HELP_STRING([--with-mozjs@<:@=xulrunner|firefox|mozilla|seamonkey|no@:>@],
++            [build Mozilla JavaScript PAC runner plugin (autodetected by default)])],
+             [],
+-            [test x$have_mozjs == xyes && with_mozjs=yes])
+-if test x$with_mozjs = xyes; then
+-	if test x$have_mozjs == xyes; then
+-		MOZJS_CFLAGS="$mozjs_CFLAGS"
+-		MOZJS_LIBS="$mozjs_LIBS"
+-		AC_SUBST(MOZJS_CFLAGS)
+-		AC_SUBST(MOZJS_LIBS)
+-	else
+-		echo "Mozilla JavaScript plugin requires: mozjs!"
+-		exit 1
+-	fi
++            [with_mozjs=auto])
++
++if (test x$with_mozjs = xauto || test x$with_mozjs = xyes); then
++	PKG_CHECK_MODULES(mozjs, xulrunner-js, with_mozjs=xulrunner, 
++			[PKG_CHECK_MODULES(mozjs, firefox-js, with_mozjs=firefox,
++			[PKG_CHECK_MODULES(mozjs, mozilla-js, with_mozjs=mozilla,
++			[PKG_CHECK_MODULES(mozjs, seamonkey-js, with_mozjs=seamonkey,
++				[test x$with_mozjs = xauto && with_mozjs = no || with_mozjs = error])])])])
++elif test x$with_mozjs != xno; then
++	PKG_CHECK_MODULES(mozjs, [$with_mozjs[]-js])
++fi
++
++if test x$with_mozjs = xerror; then
++	AC_MSG_ERROR([cannot find any mozjs provider])
+ else
+-	with_mozjs=no
++	AC_MSG_RESULT([$with_mozjs])
++	MOZJS_CFLAGS="$mozjs_CFLAGS"
++	MOZJS_LIBS="$mozjs_LIBS"
++	AC_SUBST(MOZJS_CFLAGS)
++	AC_SUBST(MOZJS_LIBS)
+ fi
+-AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs = xyes])
++
++AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs != xno])
+ 
+ # NetworkManager
+ AC_ARG_WITH([networkmanager],
diff --git a/net-libs/libproxy/libproxy-0.2.3-r2.ebuild b/net-libs/libproxy/libproxy-0.2.3-r2.ebuild
new file mode 100644
index 000000000..96696a8c7
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.2.3-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2009/06/29 19:26:13 leio Exp $
+
+EAPI="2"
+
+inherit autotools eutils python portability multilib-native
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="http://code.google.com/p/libproxy/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome kde networkmanager python seamonkey webkit xulrunner"
+
+RDEPEND="
+	gnome? ( 
+		x11-libs/libX11[lib32?]
+		x11-libs/libXmu[lib32?]
+		gnome-base/gconf[lib32?] )
+	kde? (
+		x11-libs/libX11[lib32?]
+		x11-libs/libXmu[lib32?] )
+	networkmanager? ( net-misc/networkmanager[lib32?] )
+	python? ( >=dev-lang/python-2.5[lib32?] )
+	webkit? ( net-libs/webkit-gtk[lib32?] )
+	xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9[lib32?] )
+	!xulrunner? ( seamonkey? ( www-client/seamonkey[lib32?] ) )
+"
+# Since xulrunner-1.9.0.11-r1 its shipped mozilla-js.pc is fixed so we can use it
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19"
+
+src_prepare() {
+	# http://code.google.com/p/libproxy/issues/detail?id=23
+	epatch "${FILESDIR}/${P}-fix-dbus-includes.patch"
+
+	# http://code.google.com/p/libproxy/issues/detail?id=24
+	epatch "${FILESDIR}/${P}-fix-python-automagic.patch"
+
+	# http://code.google.com/p/libproxy/issues/detail?id=25
+	epatch "${FILESDIR}/${P}-fix-as-needed-problem.patch"
+
+	# Bug 275127 and 275318
+	epatch "${FILESDIR}/${P}-fix-automagic-mozjs.patch"
+	
+	# 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).
+	# FIXME: This doesn't actually fix all == instances when two are on the same line
+	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	local myconf
+
+	# xulrunner:1.9 => mozilla;   seamonkey => seamonkey;
+	# xulrunner:1.8 => xulrunner; (firefox => mozilla-firefox[-xulrunner] ?)
+	if use xulrunner; then myconf="--with-mozjs=mozilla"
+	elif use seamonkey; then myconf="--with-mozjs=seamonkey"
+	else myconf="--without-mozjs"
+	fi
+
+	econf --with-envvar \
+		--with-file \
+		--disable-static \
+		$(use_with gnome) \
+		$(use_with kde) \
+		$(use_with webkit) \
+		${myconf} \
+		$(use_with networkmanager) \
+		$(use_with python)
+}
+
+multilib-native_src_compile_internal() {
+	emake LIBDL="$(dlopen_lib)" || die
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" LIBDL="$(dlopen_lib)" install || die "emake install failed!"
+	dodoc AUTHORS NEWS README ChangeLog || die "dodoc failed"
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize "$(python_get_sitedir)/${PN}.py"
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py
+}