Fix wspy_dissectors error, bug 363895#c5. Drop stable keywords on 1.4.5 as it's buggy.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 45 insertions, 12 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 284f1467f574..0645a0055d56 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.285 2011/04/29 03:08:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.286 2011/04/29 09:51:08 pva Exp $
+
+  29 Apr 2011; Peter Volkov <pva@gentoo.org> wireshark-1.4.5.ebuild,
+  -wireshark-1.4.6.ebuild, +wireshark-1.4.6-r1.ebuild,
+  +files/wireshark-1.4.6-wspy_dissectors_dir.patch:
+  Fix wspy_dissectors error, bug 363895#c5. Drop stable keywords on 1.4.5 as
+  it's buggy.
+
+*wireshark-1.4.6-r1 (29 Apr 2011)
+
+  29 Apr 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.4.6.ebuild,
+  +wireshark-1.4.6-r1.ebuild,
+  +files/wireshark-1.4.6-wspy_dissectors_dir.patch:
+  Fix wspy_dissectors error, bug 363895#c5
 
 *wireshark-1.4.6 (29 Apr 2011)
 
diff --git a/net-analyzer/wireshark/files/wireshark-1.4.6-wspy_dissectors_dir.patch b/net-analyzer/wireshark/files/wireshark-1.4.6-wspy_dissectors_dir.patch
new file mode 100644
index 000000000000..864944a5d3c2
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.4.6-wspy_dissectors_dir.patch
@@ -0,0 +1,19 @@
+=== modified file 'epan/wspython/Makefile.am'
+--- epan/wspython/Makefile.am	2011-04-29 06:57:10 +0000
++++ epan/wspython/Makefile.am	2011-04-29 07:15:20 +0000
+@@ -44,12 +44,14 @@
+ libwspython_la_CFLAGS = @PY_CFLAGS@
+ 
+ wspythondir=@pythondir@
++wspythondissectorsdir=@pythondir@/wspy_dissectors
+ 
+ wspython_DATA= \
+   register-dissector.py \
+   wspy_dissector.py \
+   wspy_libws.py
+ 
++wspythondissectors_DATA=
+ 
+ EXTRA_DIST = \
+ 	Makefile.common		\
+
diff --git a/net-analyzer/wireshark/wireshark-1.4.5.ebuild b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
index 4fc0de21d074..a8ed9a9e5204 100644
--- a/net-analyzer/wireshark/wireshark-1.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.5.ebuild,v 1.3 2011/04/18 18:28:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.5.ebuild,v 1.4 2011/04/29 09:51:08 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
 
diff --git a/net-analyzer/wireshark/wireshark-1.4.6.ebuild b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
index 3dbd7c0da1c3..7e8bf20e87ec 100644
--- a/net-analyzer/wireshark/wireshark-1.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6.ebuild,v 1.1 2011/04/29 03:08:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.1 2011/04/29 09:51:08 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit libtool flag-o-matic eutils toolchain-funcs python
+inherit libtool flag-o-matic eutils toolchain-funcs python autotools
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -15,9 +15,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
+profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
-RDEPEND=">=dev-libs/glib-2.14.0:2
+RDEPEND=">=dev-libs/glib-2.14:2
 	zlib? ( sys-libs/zlib
 		!=sys-libs/zlib-1.2.4 )
 	smi? ( net-libs/libsmi )
@@ -28,7 +28,6 @@ RDEPEND=">=dev-libs/glib-2.14.0:2
 	ssl? ( net-libs/gnutls )
 	gcrypt? ( dev-libs/libgcrypt )
 	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	portaudio? ( media-libs/portaudio )
@@ -40,6 +39,7 @@ RDEPEND=">=dev-libs/glib-2.14.0:2
 
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt
+		app-text/docbook-xml-dtd:4.2
 		dev-libs/libxml2
 		app-doc/doxygen
 		doc-pdf? ( dev-java/fop ) )
@@ -102,6 +102,11 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-wspy_dissectors_dir.patch"
+	eautoreconf
+}
+
 src_configure() {
 	local myconf
 
@@ -155,7 +160,6 @@ src_configure() {
 		$(use_with smi libsmi) \
 		$(use_with pcap) \
 		$(use_with zlib) \
-		$(use_with pcre) \
 		$(use_with geoip) \
 		$(use_with portaudio) \
 		$(use_with python) \
@@ -177,9 +181,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	if use doc; then
 		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-#		for dir in ws{d,u}g_html{,_chunked}; do
-#			dohtml -p ${dir} -r docbook/${dir}/ || die
-#		done
 		if use doc-pdf; then
 			insinto /usr/share/doc/${PF}/pdf/
 			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf || die