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

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

5 files changed, 49 insertions, 25 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/Manifest b/net-analyzer/wireshark/Manifest
index c14f872fb19a..d4476b9839c7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,25 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
 AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
+AUX wireshark-1.4.6-wspy_dissectors_dir.patch 448 RMD160 db69133ea4bf42fcdaf07116d117c75fd7202947 SHA1 1f26264363e1546bf7c59a394632d77f1e300361 SHA256 33d0ca4222aaa4697d279be257c51d8670c06280c481934fae0aa4e303a2c48d
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.4.4.tar.bz2 20479081 RMD160 47f9274cd6933684339b4c7c0b7c723d8c9b1512 SHA1 4d1d7e7bf07683723b661eb7b7124b2e90106087 SHA256 6033e627c40ac4eec7e95c03728b497ee2bc5851af8c9e58bb89b7496717dc0d
 DIST wireshark-1.4.5.tar.bz2 20501797 RMD160 c6e66948c6a6573c85e0812cbd57845d08cc455d SHA1 3cb627ed61045799e419fbc3735000e1a59a1243 SHA256 d386353162269b12e749496680fdb826bf17cffdd55677e6b7b7fb59fa7f685f
 DIST wireshark-1.4.6.tar.bz2 20496268 RMD160 7ecb1c006eb70858e21019a731d038478a3f7879 SHA1 dd283b3957d1096bd643ab4b83b19dd2d7d6bfd8 SHA256 f923f1e923dcb479b7fdb9bc6d4ce4c27ae8ac1f0148f2820bece476872df1d7
 EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
-EBUILD wireshark-1.4.5.ebuild 6420 RMD160 08594dd2e1cccf7f89df38480e716d275e8a412f SHA1 9daed4e648fa5518ed34bfc418a5467d3e701ffd SHA256 a6c797977b6b8ed6a8733b22880a3bec98078c64e2d55e6001ff4b36db6e5105
-EBUILD wireshark-1.4.6.ebuild 6422 RMD160 c891d31c9c9efb173ba885e42afe605fb2348dca SHA1 374b97e6695a6359a97707299555b00ad2bb546c SHA256 346ef2559db21aebc2645dadf134800777370b97d4661ab372566bd0f90d420a
-MISC ChangeLog 41551 RMD160 2183650a0aa8c454162fee8467847e355ef31d65 SHA1 d9d00b76b164d6a82fa2c0f16e36d608d9c8a4ed SHA256 95f972758518731ce6cc5a5b802d9780dd210ab3b9b69fb7e56b2f6d2933df37
+EBUILD wireshark-1.4.5.ebuild 6422 RMD160 f0438528d51f0e13eef4f471c4cab6c89e5165ff SHA1 04bd74ac6178257681b06e44994bc76b84047344 SHA256 bce48d5dd1005638fbdecc320bf6ec9f2c640e9b1659088a177949864610ecf3
+EBUILD wireshark-1.4.6-r1.ebuild 6397 RMD160 819c3d25c00ac7103ef4fa24f8941404086ab2db SHA1 ce3e60231cc13278d3d459823a86b5838fc0c070 SHA256 ae2e609a55e54f6024cdf7147a6c9b4c66a0761b178abbfd1ed13a36e96ed28f
+MISC ChangeLog 42050 RMD160 1ee7cc78ab353dc60d70f6b4c2060eb866cd81b5 SHA1 be6ea8a87a188ee2e668dc6df340b6430ad31c88 SHA256 47d079be55c1f9ffc7681cc027d3eb8f34e67fc3487cdcfe11b4a9ae366f1b95
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk26K8YACgkQVWmRsqeSphM6kQCffaXkk0xbsPGoR+Uz4WqUZRCf
-x2kAn1+BzLHoJBnzLW/7XTVVQlkwjR0t
-=aBj3
------END PGP SIGNATURE-----
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