Drop javascript support as it's completely broken, bug #262504#c25 by Richard Grenville. I will start to be his proxy-maintainer for this also.

(Portage version: 2.1.10.46/cvs/Linux x86_64)

3 files changed, 44 insertions, 12 deletions

diff --git a/net-misc/pavuk/ChangeLog b/net-misc/pavuk/ChangeLog
index 372ffc5c1f43..d61df0ef9a79 100644
--- a/net-misc/pavuk/ChangeLog
+++ b/net-misc/pavuk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/pavuk
 # Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.35 2012/02/16 09:24:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.36 2012/02/17 08:13:23 pacho Exp $
+
+  17 Feb 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml,
+  pavuk-0.9.36_pre20120215.ebuild:
+  Drop javascript support as it's completely broken, bug #262504#c25 by Richard
+  Grenville. I will start to be his proxy-maintainer for this also.
 
 *pavuk-0.9.36_pre20120215 (16 Feb 2012)
 
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index c57d13c31c8b..383b80fde47c 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/metadata.xml
@@ -2,7 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>pyxlcy@gmail.com</email>
+	<description>Please assign bugs</description>
+</maintainer>
+<maintainer>
+	<email>pacho@gentoo.org</email>
+	<description>proxy-maintainer, please CC on bugs</description>
 </maintainer>
 <use>
 <flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
diff --git a/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild b/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild
index 41a7b85ac996..77fb54a8b577 100644
--- a/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild,v 1.1 2012/02/16 09:24:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild,v 1.2 2012/02/17 08:13:23 pacho Exp $
 
 EAPI=4
 
@@ -15,11 +15,10 @@ SRC_URI="http://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug gtk javascript hammer ipv6 nls profile ssl"
+IUSE="debug gtk hammer ipv6 nls profile ssl"
 
 RDEPEND="virtual/libintl
 	gtk? ( x11-libs/gtk+:2 )
-	javascript? ( dev-lang/spidermonkey )
 	ssl? ( dev-libs/openssl )"
 
 DEPEND="${RDEPEND}
@@ -33,8 +32,15 @@ DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO
 		ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample
 		)
 src_prepare() {
+	# Fixes a bug in Makefile.am that causes aclocal to fail
 	sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die
+
+	# Fixes a bug in configure.in that breaks non-debug builds
 	sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die
+
+	# Fix for building with ~dev-lang/spidermonkey-1.8.5
+	# sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die
+
 	autotools-utils_src_prepare
 }
 
@@ -43,6 +49,7 @@ src_configure() {
 			--enable-threads
 			--enable-socks
 			--enable-utf-8
+			--disable-js
 			$(use_enable gtk)
 			$(use_enable gtk gtk2)
 			$(use_enable gtk gnome)
@@ -53,24 +60,39 @@ src_configure() {
 			$(use_enable ssl)
 			$(use_enable nls)
 			$(use_enable ipv6)
-			$(use_enable javascript js)
+			# $(use_enable javascript js)
 			$(use_enable profile profiling)
 	)
-	# PCRE support is broken!
+
+	# PCRE support: Broken!
+	# =====================
+
 	# if use pcre; then
 	#	myeconfargs=($myeconfargs --with-regex=pcre)
 	# else
 		myeconfargs+=( "--with-regex=auto" )
 	# fi
+
+	# JavaScript bindings: Broken!
+	# ============================
+	# Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5
+	# yet apparently incompatible with recent versions of spidermonkey
+
+	# if use javascript; then
+	# 	local jspkg='mozjs185'
+	# 	local jsinclude=$(pkg-config --cflags "$jspkg")
+	# 	local jslibs='/dev/null '$(pkg-config --libs-only-l "$jspkg")
+	# 	myeconfargs+=(
+	# 			"--with-js-include=${jsinclude}"
+	# 			"--with-js-libraries=${jslibs}"
+	# 			)
+	# fi
+
 	autotools-utils_src_configure
 }
 
 src_install() {
-	if use gtk; then
-		insinto /usr/share/applications
-		doins "${S}/pavuk.desktop"
-	fi
-
+	use gtk && domenu "${S}/pavuk.desktop"
 	doman "${S}/doc/pavuk.1"
 
 	autotools-utils_src_install