Re-add snmp USE flag (bug #152701). Thanks to Francisco Javier <ffelix@sshinf.com> for the patch.

Package-Manager: portage-2.1.2_pre3-r7

4 files changed, 61 insertions, 12 deletions

diff --git a/net-analyzer/pchar/ChangeLog b/net-analyzer/pchar/ChangeLog
index f1053a956143..66dcc86b3b95 100644
--- a/net-analyzer/pchar/ChangeLog
+++ b/net-analyzer/pchar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/pchar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pchar/ChangeLog,v 1.2 2006/03/24 17:46:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pchar/ChangeLog,v 1.3 2006/11/01 21:15:57 chutzpah Exp $
+
+  01 Nov 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/pchar-1.5-snmp.patch, pchar-1.5.ebuild:
+  Re-add snmp USE flag (bug #152701). Thanks to Francisco Javier
+  <ffelix@sshinf.com> for the patch.
 
   24 Mar 2006; Patrick McLean <chutzpah@gentoo.org> pchar-1.5.ebuild:
   Dropped snmp USE flag to fix bug #127389.
diff --git a/net-analyzer/pchar/Manifest b/net-analyzer/pchar/Manifest
index 593f23f8751c..045b45bd6f28 100644
--- a/net-analyzer/pchar/Manifest
+++ b/net-analyzer/pchar/Manifest
@@ -1,12 +1,20 @@
-MD5 1e2978c35f65e9bece404ddd6a8c7d71 ChangeLog 460
-RMD160 12dfdf435c8564da90226fc441b47a8a06616432 ChangeLog 460
-SHA256 ff538ebd9373e1192e82114ba27c549d4a71385378eb1f8b2805a67561bab70b ChangeLog 460
-MD5 aab4d3f46ad734ca9356fdf6e16dc625 files/digest-pchar-1.5 229
-RMD160 6677ffe688682ea0392c8ffb18cf33eb720420ef files/digest-pchar-1.5 229
-SHA256 8f8790c0204f8f42d2101c45da5ec6e0375d78e7f9fa46b6edbc646669fcbb88 files/digest-pchar-1.5 229
+AUX pchar-1.5-snmp.patch 874 RMD160 4538e206dbc30612e5bf5406696c5f557048b2e1 SHA1 684b675698953f7473b28cb71265a12f2bd750bb SHA256 3c67ac2ef21c7d503f28a5020baf763c9ca24f99d38b078bb5dcb3e8a3424f38
+MD5 9783a650c9523f48822bc67ef1ff7099 files/pchar-1.5-snmp.patch 874
+RMD160 4538e206dbc30612e5bf5406696c5f557048b2e1 files/pchar-1.5-snmp.patch 874
+SHA256 3c67ac2ef21c7d503f28a5020baf763c9ca24f99d38b078bb5dcb3e8a3424f38 files/pchar-1.5-snmp.patch 874
+DIST pchar-1.5.tar.gz 117678 RMD160 b8e600b9c11cf7e584768c87aadeeb9d7b482949 SHA256 7019297084f1000557a019501532ecae67772851717329cc02227f5c17e36d27
+EBUILD pchar-1.5.ebuild 884 RMD160 659d86f4c7c3f57de6b10b1f42f350ddc07ece8e SHA1 d234e3722bae23baf5df0ac4a61b1f1ea262f0be SHA256 f6ba8409e275be8f97b2bb16745a2197c4f10b000ef54b9a040fd40ac00a9ccb
+MD5 301c34b9d5f86c55b1f6bf75d2ee4241 pchar-1.5.ebuild 884
+RMD160 659d86f4c7c3f57de6b10b1f42f350ddc07ece8e pchar-1.5.ebuild 884
+SHA256 f6ba8409e275be8f97b2bb16745a2197c4f10b000ef54b9a040fd40ac00a9ccb pchar-1.5.ebuild 884
+MISC ChangeLog 664 RMD160 91bb3abe28f14ea8d92814a9cbb3d60ea84fbaff SHA1 e28f69e2df24d22418b36927615355b68ee5c1bb SHA256 0fafd9a9490d951d8d62f6097d6bb61912559608bfbac3c934965c14a8c34629
+MD5 86ba617c1f36441005e2ce473fb9a008 ChangeLog 664
+RMD160 91bb3abe28f14ea8d92814a9cbb3d60ea84fbaff ChangeLog 664
+SHA256 0fafd9a9490d951d8d62f6097d6bb61912559608bfbac3c934965c14a8c34629 ChangeLog 664
+MISC metadata.xml 551 RMD160 0cfd8e20c889083622dbb25abf1bb13d6c6aa20d SHA1 b530829b723b1fb5aca73b37b6cd8561c009861a SHA256 240b5fd4a04e6605ef5b4a746483a41e186732348f0ede30a6f590d5dc009202
 MD5 e51ee72962d960c4006ab6fe7e27fd84 metadata.xml 551
 RMD160 0cfd8e20c889083622dbb25abf1bb13d6c6aa20d metadata.xml 551
 SHA256 240b5fd4a04e6605ef5b4a746483a41e186732348f0ede30a6f590d5dc009202 metadata.xml 551
-MD5 e68a54b4e2892225870ee18554c998bf pchar-1.5.ebuild 725
-RMD160 76f33a87b739b6c46a423301ddec19ed2a761843 pchar-1.5.ebuild 725
-SHA256 9af64657def452685cadc47d77745e26d5e812ca87d4c27d92d4707b9cd40713 pchar-1.5.ebuild 725
+MD5 aab4d3f46ad734ca9356fdf6e16dc625 files/digest-pchar-1.5 229
+RMD160 6677ffe688682ea0392c8ffb18cf33eb720420ef files/digest-pchar-1.5 229
+SHA256 8f8790c0204f8f42d2101c45da5ec6e0375d78e7f9fa46b6edbc646669fcbb88 files/digest-pchar-1.5 229
diff --git a/net-analyzer/pchar/files/pchar-1.5-snmp.patch b/net-analyzer/pchar/files/pchar-1.5-snmp.patch
new file mode 100644
index 000000000000..9ebfbad39eb0
--- /dev/null
+++ b/net-analyzer/pchar/files/pchar-1.5-snmp.patch
@@ -0,0 +1,24 @@
+--- GetIfInfo.h.old	2005-02-12 21:32:18.000000000 +0100
++++ GetIfInfo.h	2006-09-22 11:08:44.000000000 +0200
+@@ -17,7 +17,7 @@
+   bool	IsValid(void);
+ 
+   const char *	GetDescription(void) const;
+-  const char *	GetIfInfo::GetName(void) const;
++  const char *	GetName(void) const;
+   const char *	GetContact(void) const;
+   const char *	GetLocation(void) const;
+   const char *	GetIfDescription(void) const;
+--- configure.in.old	2005-02-12 21:32:18.000000000 +0100
++++ configure.in	2006-10-24 23:08:38.000000000 +0200
+@@ -128,8 +128,8 @@
+ 	LDFLAGS="-L$with_snmp/lib $LDFLAGS"
+ 	CPPFLAGS="-I$with_snmp/include $CPPFLAGS"
+     fi
+-    AC_CHECK_LIB(crypto, des_cbc_encrypt)
+-    AC_CHECK_LIB(snmp, snmp_sess_init,,,-lcrypto)
++    AC_CHECK_LIB(crypto, DES_cbc_encrypt)
++    AC_CHECK_LIB(snmp, snmp_sess_init)
+ fi
+ 
+ dnl pcap support if desired.  If the user enabled --with-pcap,
diff --git a/net-analyzer/pchar/pchar-1.5.ebuild b/net-analyzer/pchar/pchar-1.5.ebuild
index 4e8f0673f851..5ab15ff66428 100644
--- a/net-analyzer/pchar/pchar-1.5.ebuild
+++ b/net-analyzer/pchar/pchar-1.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pchar/pchar-1.5.ebuild,v 1.2 2006/03/24 17:46:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pchar/pchar-1.5.ebuild,v 1.3 2006/11/01 21:15:57 chutzpah Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="Internet bandwidth, latency, and loss of links analyzer."
 HOMEPAGE="http://www.kitchenlab.org/www/bmah/Software/pchar/"
@@ -9,12 +11,22 @@ SRC_URI="http://www.kitchenlab.org/www/bmah/Software/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 pcap"
+IUSE="ipv6 pcap snmp"
 
 DEPEND=">=dev-libs/openssl-0.9.7
+	snmp? ( net-analyzer/net-snmp )
 	pcap? ( net-libs/libpcap )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-snmp.patch
+}
+
 src_compile() {
+	eautoreconf
+
 	econf --without-suid \
 		$(use_with ipv6) \
 		$(use_with snmp snmp /usr/lib) \