Dependancy fixed as per bug #69775. Thanks Carsten

(Portage version: 2.0.51.16)

4 files changed, 177 insertions, 12 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 325de1787b91..bcbbd8395560 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.82 2005/02/13 05:07:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.83 2005/02/17 12:26:49 dragonheart Exp $
+
+  17 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch, net-snmp-5.2.1.ebuild:
+  Dependancy fixed as per bug #69775. Thanks Carsten Lohrke <carlo@gentoo.org>
 
   12 Feb 2005; Jason Wever <weeve@gentoo.org> net-snmp-5.2.ebuild:
   Stable on sparc.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 4bc3e12c7492..5a06367d6cc3 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,19 +1,20 @@
-MD5 5a444a9b97bf6d974fa2c69b3adc392a ChangeLog 12617
+MD5 f8778ab8e29b8f0f7640a2dd1167e13d ChangeLog 12821
 MD5 feec9ceb3ba9f6a8b860a4a130998500 metadata.xml 214
+MD5 560a87f789fc140ea6b987c577c2ef67 net-snmp-5.1.1-r1.ebuild 3655
+MD5 36c85b0822032cbcb2386dc9074b0030 net-snmp-5.1.1.ebuild 2484
 MD5 82ef8cf80ac104390c860c9c8554f432 net-snmp-5.2.ebuild 3752
 MD5 15483aa80a65e7d50bf1c19f325e203b net-snmp-5.2-r3.ebuild 4212
-MD5 0234692820ea9db372dd5a13ebb7ccb5 net-snmp-5.2.1.ebuild 4211
-MD5 36c85b0822032cbcb2386dc9074b0030 net-snmp-5.1.1.ebuild 2484
-MD5 560a87f789fc140ea6b987c577c2ef67 net-snmp-5.1.1-r1.ebuild 3655
-MD5 93ce82e69e9c66badd05144fd498530c files/digest-net-snmp-5.2 65
+MD5 2d802fb4d906165f3bcf9cf6568edf27 net-snmp-5.2.1.ebuild 4490
+MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1 67
+MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1-r1 67
 MD5 93ce82e69e9c66badd05144fd498530c files/digest-net-snmp-5.2-r3 65
-MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 93ce82e69e9c66badd05144fd498530c files/digest-net-snmp-5.2 65
+MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
 MD5 1cc5b20de8fc9e7c807195c320ab2f4b files/net-snmp-proc.patch 2448
 MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
 MD5 00ce9b4fa6d597e08af7ce82d3a5c246 files/snmpd.conf 599
 MD5 662833e61042a47d4bd8aaae404f4245 files/snmpd.rc6 710
-MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1 67
-MD5 b492aa2a6ad459eb41a26932d4c0740b files/digest-net-snmp-5.1.1-r1 67
-MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
+MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
 MD5 f4562e4c61904b17dab28aae2836ff6e files/digest-net-snmp-5.2.1 67
+MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch
new file mode 100644
index 000000000000..9ba303369298
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch
@@ -0,0 +1,147 @@
+--- configure.orig	2005-02-17 20:20:50.735101408 +0930
++++ configure	2005-02-17 20:36:35.883389400 +0930
+@@ -1253,7 +1253,9 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+   --with-pic              try to use only PIC/non-PIC objects default=use both
+   --with-libwrap=LIBPATH Compile in libwrap (tcp_wrappers) support.
++  --without-elf        use elf libraries
+   --with-zlib=DIR        use libz in DIR
++  --with-bzip2=DIR          use libbzip2 in DIR
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5911,7 +5913,7 @@
+ case $host in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5914 "configure"' > conftest.$ac_ext
++  echo '#line 5916 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6483,7 +6485,7 @@
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+ compiler_c_o=no
+-if { (eval echo configure:6486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:6488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+   # The compiler can only warn and ignore the option if not recognized
+   # So say no if there are warnings
+   if test -s out/conftest.err; then
+@@ -8447,7 +8449,7 @@
+     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8450 "configure"
++#line 8452 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -8545,7 +8547,7 @@
+     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8548 "configure"
++#line 8550 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14405,6 +14407,12 @@
+ 
+ # nlist is needed for uptime on some sytems in the generic library
+ 
++# Check whether --with-elf or --without-elf was given.
++if test "${with_elf+set}" = set; then
++  withval="$with_elf"
++
++  if test "x$with_elf" != "xno"; then
++
+ echo "$as_me:$LINENO: checking for nlist in -lelf" >&5
+ echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" >&6
+ if test "${ac_cv_lib_elf_nlist+set}" = set; then
+@@ -14478,6 +14486,11 @@
+ 
+ fi
+ 
++  fi
++
++fi;
++
++
+ 
+ # On some platforms (Irix) libnsl and libsocket should not be used.
+ echo "$as_me:$LINENO: checking for gethostbyname" >&5
+@@ -15250,7 +15263,17 @@
+ 
+ 
+   # two variants of bzip2 need checking.
+-  echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
++
++# Check whether --with-bzip2 or --without-bzip2 was given.
++if test "${with_bzip2+set}" = set; then
++  withval="$with_bzip2"
++
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5
+ echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzread+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15387,6 +15410,10 @@
+ 
+ fi
+ 
++    fi
++
++fi;
++
+ 
+   # two variants of db1 need checking.
+   echo "$as_me:$LINENO: checking for dbopen in -ldb1" >&5
+--- configure.in.orig	2005-02-17 19:14:14.000000000 +0930
++++ configure.in	2005-02-17 20:36:18.450039672 +0930
+@@ -1,3 +1,4 @@
++Wrpm
+ # Portions of this file are subject to the following copyright.  See
+ # the Net-SNMP's COPYING file for more details and other copyrights
+ # that may apply:
+@@ -2172,7 +2173,14 @@
+ # AC_CHECK_LIB(des, main)
+ AC_CHECK_LIB(m, asin)
+ # nlist is needed for uptime on some sytems in the generic library
+-AC_CHECK_LIB(elf, nlist)
++ AC_ARG_WITH(elf,
++  [  --without-elf        use elf libraries],[
++  if test "x$with_elf" != "xno"; then
++     AC_CHECK_LIB(elf, nlist)
++  fi
++  ])
++
++ 
+ 
+ # On some platforms (Irix) libnsl and libsocket should not be used.
+ AC_CHECK_FUNC(gethostbyname, AC_DEFINE(HAVE_GETHOSTBYNAME),
+@@ -2219,8 +2227,18 @@
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+ 
+   # two variants of bzip2 need checking.
+-  AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
+-     AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++  AC_ARG_WITH(bzip2,
++  [  --with-bzip2[=DIR]          use libbzip2 in DIR],[
++    if test -d "$withval"; then
++      CPPFLAGS="${CPPFLAGS} -I$withval/include"
++      LDFLAGS="${LDFLAGS} -L$withval/lib"
++    fi
++    if test "x$with_bzip2" != "xno"; then
++      AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
++      AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
++    fi
++  ])
++
+ 
+   # two variants of db1 need checking.
+   AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild
index 862c9d947f6d..4e44e3bd516d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild,v 1.1 2005/02/09 14:54:46 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.ebuild,v 1.2 2005/02/17 12:26:49 dragonheart Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc"
+IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
 
 PROVIDE="virtual/snmp"
 DEPEND="virtual/libc
@@ -22,7 +22,15 @@ DEPEND="virtual/libc
 	lm_sensors? (
 		x86?   ( sys-apps/lm-sensors )
 		amd64? ( sys-apps/lm-sensors )
+	)
+	!ppc64? ( rpm? ( app-arch/rpm
+		dev-libs/popt
+		app-arch/bzip2
+		)
+		elf? ( dev-libs/elfutils )
 	)"
+	#ppc64 keyword awaiting bug #82341
+
 RDEPEND="${DEPEND}
 	dev-perl/TermReadKey
 	perl? ( X? ( dev-perl/perl-tk ) )
@@ -56,6 +64,8 @@ src_unpack() {
 		|| die "sed configure.in failed"
 
 	ht_fix_all
+
+	epatch ${FILESDIR}/${P}-conf-elf-rpm-bz2.patch || die "patch failed"
 }
 
 src_compile() {
@@ -81,6 +91,9 @@ src_compile() {
 		--enable-ucd-snmp-compatibility \
 		--enable-shared \
 		--with-zlib \
+		`use_with rpm` \
+		`use_with rpm bzip2` \
+		`use_with elf` \
 		--with-install-prefix="${D}" \
 		${myconf} || die "econf failed"