Fix bug 300457

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 118 insertions, 3 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index d0284ff88b84..5c0439cd855a 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2009/10/31 14:09:27 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.25 2010/03/05 09:33:57 pacho Exp $
+
+*libproxy-0.2.3-r3 (05 Mar 2010)
+
+  05 Mar 2010; Pacho Ramos <pacho@gentoo.org> +libproxy-0.2.3-r3.ebuild:
+  Drop seamonkey dependency due bug 300457 , thanks to Lars Wendler
 
   31 Oct 2009; Brent Baude <ranger@gentoo.org> libproxy-0.2.3-r2.ebuild:
   Marking libproxy-0.2.3-r2 ppc64 for bug 289419
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 328ee9955859..d39a61bb4ce8 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -6,5 +9,13 @@ 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-r2.ebuild 2827 RMD160 3a968c39169dab9119ee535da207f41774e06eb8 SHA1 d73a858ea864fd69fa46de6c579a1e8eb287c8e4 SHA256 a59467e8cbb39df8cf269c953b3851eb68eaa28117cbb832767e381905daae28
-MISC ChangeLog 4331 RMD160 47cc9946a645a8134b27d551cbe4eb397b0291ed SHA1 ed0bddfcb279219e87d1d35baed5c3aaf206777a SHA256 aead84529ef4d1d8109e1831ac6048bdf8c7e14dbe238b91da9913843de1327a
+EBUILD libproxy-0.2.3-r3.ebuild 2689 RMD160 bb63276ef6bd5409bedaf15d7848595efced11c2 SHA1 f6614d8fe0c7c61bba0a0a1729a47d834e7e7b80 SHA256 a47c69314e698a689d97225b8844da33e7fb1a59a071754d0b2722ff59680984
+MISC ChangeLog 4506 RMD160 5373c5fd3fb5ec230c8217ab5e302c0775be3b43 SHA1 f89c4a57a334cf52c893f571e83d6f9bf4329fa0 SHA256 cb5e812cf20076c537947f16879b1e2c741f738bfdaf824d793f6940c53c41b9
 MISC metadata.xml 582 RMD160 333479b481893ba9bf6aff3d2b36e3ed676ab7e8 SHA1 0a267d1e753216b35fee81b47793be3e62d3dd75 SHA256 f71eab2416b0db74fbae2c452b485a8d5b19dd7a3e6638e29790c18a22049a26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuQ0AsACgkQCaWpQKGI+9TzcACeIkqe1lvTIvWoYI9CXQQZeT+d
+hJgAn12GloJDMNUj8nU2l+ZCtPM7o7Yz
+=9bhP
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/libproxy-0.2.3-r3.ebuild b/net-libs/libproxy/libproxy-0.2.3-r3.ebuild
new file mode 100644
index 000000000000..84199b0c3242
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.2.3-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/03/05 09:33:57 pacho Exp $
+
+EAPI="2"
+
+inherit autotools eutils python portability
+
+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 webkit xulrunner"
+
+RDEPEND="
+	gnome? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		gnome-base/gconf )
+	kde? (
+		x11-libs/libX11
+		x11-libs/libXmu )
+	networkmanager? ( net-misc/networkmanager )
+	python? ( >=dev-lang/python-2.5 )
+	webkit? ( net-libs/webkit-gtk )
+	xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9 )
+"
+# 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
+}
+
+src_configure() {
+	local myconf
+
+	# xulrunner:1.9 => mozilla;
+	# xulrunner:1.8 => xulrunner; (firefox => mozilla-firefox[-xulrunner] ?)
+	if use xulrunner; then myconf="--with-mozjs=mozilla"
+	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)
+}
+
+src_compile() {
+	emake LIBDL="$(dlopen_lib)" || die
+}
+
+src_install() {
+	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
+}