diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-24 21:01:48 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-24 21:01:48 +0000 |
| commit | eb5d1cc41a6556282cba893618599eb4ccd7b53e (patch) | |
| tree | 776da7d76957674286c6cb238cd08fb41ef400de /net-analyzer/ethereal | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-eb5d1cc41a6556282cba893618599eb4ccd7b53e.tar.gz gentoo-2-eb5d1cc41a6556282cba893618599eb4ccd7b53e.tar.bz2 gentoo-2-eb5d1cc41a6556282cba893618599eb4ccd7b53e.zip | |
don't use deprecated ?: use syntax; use sed -i; tidy
Diffstat (limited to 'net-analyzer/ethereal')
| -rw-r--r-- | net-analyzer/ethereal/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/ethereal/ethereal-0.9.14.ebuild | 36 |
2 files changed, 28 insertions, 13 deletions
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog index ed4ad6e2c084..92aa928cbef5 100644 --- a/net-analyzer/ethereal/ChangeLog +++ b/net-analyzer/ethereal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/ethereal # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.52 2004/03/20 06:54:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.53 2004/03/24 21:01:48 mr_bones_ Exp $ + + 24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ethereal-0.9.14.ebuild: + don't use deprecated ?: use syntax; use sed -i; tidy 19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ethereal-0.10.2.ebuild, ethereal-0.9.16-r1.ebuild, ethereal-0.9.16.ebuild: diff --git a/net-analyzer/ethereal/ethereal-0.9.14.ebuild b/net-analyzer/ethereal/ethereal-0.9.14.ebuild index 2f25ffab626b..0c80618acc49 100644 --- a/net-analyzer/ethereal/ethereal-0.9.14.ebuild +++ b/net-analyzer/ethereal/ethereal-0.9.14.ebuild @@ -1,26 +1,35 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.14.ebuild,v 1.4 2004/01/05 13:05:18 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.14.ebuild,v 1.5 2004/03/24 21:01:48 mr_bones_ Exp $ -IUSE="gtk ipv6 snmp ssl gtk2" inherit libtool -S=${WORKDIR}/${P} + DESCRIPTION="A commercial-quality network protocol analyzer" SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2" HOMEPAGE="http://www.ethereal.com/" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="x86 ~sparc ~ppc alpha" +IUSE="gtk ipv6 snmp ssl gtk2" RDEPEND=">=sys-libs/zlib-1.1.4 snmp? ( virtual/snmp ) - gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) : ( gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) ) - gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) + gtk? ( + gtk2? ( + >=dev-libs/glib-2.0.4 + =x11-libs/gtk+-2* + ) + !gtk2? ( + =x11-libs/gtk+-1.2* + =dev-libs/glib-1.2* + ) + ) ssl? ( >=dev-libs/openssl-0.9.6e ) >=net-libs/libpcap-0.7.1" DEPEND="${RDEPEND} + >=sys-apps/sed-4 dev-lang/perl sys-devel/bison sys-devel/flex" @@ -30,11 +39,14 @@ src_unpack() { cd ${S} elibtoolize # gcc related configure script braindamage - sed -i "s|-I/usr/local/include||" configure + sed -i \ + -e "s|-I/usr/local/include||" configure \ + || die "sed configure failed" chmod +x ./configure - mv Makefile.am Makefile.am.orig - sed "s|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@|" \ - Makefile.am.orig > Makefile.am + sed -i \ + -e "s|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@|@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@|" \ + Makefile.am \ + || die "sed Makefile.am failed" } src_compile() { @@ -69,6 +81,6 @@ src_compile() { src_install() { addwrite "/usr/share/snmp/mibs/.index" dodir /usr/lib/ethereal/plugins/${PV} - make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO } |