[patch] Patch for .15 ebuild for .16

patch-.15-.16 (text/plain), 1.21 KB, created by Patrick Kursawe (RETIRED) on 2003-11-05 02:31:29 UTC

--- ethereal-0.9.15.ebuild	2003-10-07 00:44:32.000000000 +0200
+++ ethereal-0.9.16.ebuild	2003-11-05 11:05:52.000000000 +0100
@@ -16,7 +16,8 @@
 RDEPEND=">=sys-libs/zlib-1.1.4
 	snmp? ( virtual/snmp )
 	gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-	!gtk2 ( gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) )
+	!gtk2 ( gtk? ( =x11-libs/gtk+-1.2* ) )
+	=dev-libs/glib-1.2* 
 	ssl? ( >=dev-libs/openssl-0.9.6e )
 	>=net-libs/libpcap-0.7.1"
 
@@ -41,12 +42,15 @@
 
 	if [ -z "`use gtk`" ] && [ -z "`use gtk2`" ]; then
 		myconf="${myconf} --disable-ethereal"
+		# the asn1 plugin needs gtk
+		sed -i -e '/plugins\/asn1/c\' Makefile.in
+		sed -i -e 's/\(^SUBDIRS.*\)asn1\(.*\)/\1\2/' plugins/Makefile.in
 	fi
 
 	use gtk2 && myconf="${myconf} --enable-gtk2"
 	use ssl || myconf="${myconf} --without-ssl"
-	use snmp || myconf="${myconf} --without-ucd-snmp"
-	use ipv6 && myconf="${myconf} --enable-ipv6"
+	use snmp || myconf="${myconf} --without-ucd-snmp --without-net-snmp"
+	myconf="${myconf} $(use_enable ipv6)"
 
 	econf \
 		--enable-pcap \
@@ -62,6 +66,7 @@
 		--with-plugindir=/usr/lib/ethereal/plugins/${PV} \
 		${myconf} || die "bad ./configure"
 	addwrite "/usr/share/snmp/mibs/.index"
+
 	emake || die "compile problem"
 }