Version bump. Drop old.

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

3 files changed, 20 insertions, 13 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 82c8209fb042..4dc0988b9b0d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.295 2011/05/24 10:44:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.296 2011/06/02 05:42:25 pva Exp $
+
+*wireshark-1.4.7 (01 Jun 2011)
+
+  01 Jun 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.4.5.ebuild,
+  +wireshark-1.4.7.ebuild:
+  Version bump. Drop old.
 
 *wireshark-1.6.0_rc1 (24 May 2011)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 12106f4524ee..d1182de26c3e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,12 +8,12 @@ AUX wireshark-1.4.6-gnutls_nettle.patch 733 RMD160 9b8839b432b5c6231068d784d9fd3
 AUX wireshark-1.4.6-wspy_dissectors_dir.patch 460 RMD160 098cc8aa80433dff0423cf64d88be89d7716fffa SHA1 fd23ab1494482e8825c79dfc5df2cac42fbcf97d SHA256 ed59b5d0af20d3c7adffa7742c245e8640e593e519200149810df4022eb8442e
 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
+DIST wireshark-1.4.7.tar.bz2 20515206 RMD160 012ec4d7750c03bcc23e9140f31e778cde6fd645 SHA1 ba80ed0c2aa6a12fa50155bbf5b58ad41a46024e SHA256 6671a185d3cd5222a04b6c425d2ef70b84e50ebf50ace9738ae772e87bf492c1
 DIST wireshark-1.6.0rc1.tar.bz2 21833197 RMD160 e3455efe740dd41698b3369afde9673da05789b7 SHA1 89d374a6607e7afc164da7e330e405b335484720 SHA256 d19e40268f0201ca628d7b94e620b39cd180e35d9fe3dcb7da84aaeec2d5b6c2
 EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
-EBUILD wireshark-1.4.5.ebuild 6422 RMD160 f0438528d51f0e13eef4f471c4cab6c89e5165ff SHA1 04bd74ac6178257681b06e44994bc76b84047344 SHA256 bce48d5dd1005638fbdecc320bf6ec9f2c640e9b1659088a177949864610ecf3
 EBUILD wireshark-1.4.6-r1.ebuild 6438 RMD160 b9396760261ba162392ad478c01f5483352306cd SHA1 29ca80c30971bbc29307513228a756e265fb0c1e SHA256 445a08c69835d3d5fc36bd343b44c09819719203b1d707d1b7327d43be22d05b
+EBUILD wireshark-1.4.7.ebuild 6394 RMD160 3d8b8e2ba47c4d247e9ca0550fdadab8570cec71 SHA1 83779a0f74d2eb1ff6cce3636de0804b7164e9db SHA256 e5b36dca2b33e7fbbc5198c60ce92ed0d1bd9a601764e631ef94ad85a9965a9f
 EBUILD wireshark-1.6.0_rc1.ebuild 6282 RMD160 faaf02da6806748f3cc6f9492339caedabe1b059 SHA1 3912d612eddbddcb6e9189136e98a1a5723c02a2 SHA256 d9e8e01d9fad77a2e01a34bf5ccac11153d4dfa733fd281cde5f86aa8d0a325b
-MISC ChangeLog 43087 RMD160 9e98d25e3064ba15ec05b126dd8d4003443ecceb SHA1 8416fd3639a9459545df2c89000dd3fb1e2a8119 SHA256 8ff0ab790e1dab3bf722cc1149a8bbb0e1de69e1785c086ae8eae0a257712b3e
+MISC ChangeLog 43243 RMD160 d02e42e6c40cac6a19918ca94884b87f304c0b60 SHA1 4c396d2968d07add026b4461d34710cf935d2a4a SHA256 5a0c2edd2694f626db6b425ff226262b7d048d83a0610fa59dd47570fef0fd81
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
diff --git a/net-analyzer/wireshark/wireshark-1.4.5.ebuild b/net-analyzer/wireshark/wireshark-1.4.7.ebuild
index a8ed9a9e5204..47d1a1a5a3d9 100644
--- a/net-analyzer/wireshark/wireshark-1.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.7.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.5.ebuild,v 1.4 2011/04/29 09:51:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.7.ebuild,v 1.1 2011/06/02 05:42:25 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