Kill gtk2 USE flag for bug 106560
authorMarcelo Góes <vanquirius@gentoo.org>
Mon, 19 Sep 2005 19:55:39 +0000 (19:55 +0000)
committerMarcelo Góes <vanquirius@gentoo.org>
Mon, 19 Sep 2005 19:55:39 +0000 (19:55 +0000)
Package-Manager: portage-2.0.51.22-r2

net-analyzer/ethereal/ChangeLog
net-analyzer/ethereal/Manifest
net-analyzer/ethereal/ethereal-0.10.11-r1.ebuild [deleted file]
net-analyzer/ethereal/ethereal-0.10.11.ebuild [deleted file]
net-analyzer/ethereal/ethereal-0.10.12.ebuild
net-analyzer/ethereal/files/digest-ethereal-0.10.11 [deleted file]
net-analyzer/ethereal/files/digest-ethereal-0.10.11-r1 [deleted file]

index 8bfcf4e701c5908336223c6522ae6052bfb1837d..1982c05bcec90546ad770a9c0cb5461ef89cf3fe 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.135 2005/09/17 19:41:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.136 2005/09/19 19:55:39 vanquirius Exp $
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -ethereal-0.10.11.ebuild, -ethereal-0.10.11-r1.ebuild,
+  ethereal-0.10.12.ebuild:
+  Kill gtk2 USE flag for bug 106560.
 
   29 Jul 2005; Benjamin Smee <strerror@gentoo.org> ethereal-0.10.12.ebuild:
   Fixed spelling as per bug 100725
index 08a62378b323b349a14428ccf398f9cbc7352d37..6321f9dd50b20700af03d89c868db69fd6e4ab95 100644 (file)
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b56fe33d805a3bb381ec12c9c34508d4 ChangeLog 10566
-MD5 6c5bbbaca91efefb2d63cfc75903a66e ethereal-0.10.12.ebuild 3571
-MD5 c197a642ecd8faf1ac997c497a965b3b ethereal-0.10.11.ebuild 3478
-MD5 d654937d7e27a24b2ddfa68e276a64dc ethereal-0.10.11-r1.ebuild 3679
+MD5 522d6f7acd4653ce2c99368ace3db6a9 ethereal-0.10.12.ebuild 3505
+MD5 d4d00cfbd05c26084f690ad15d70cdad ChangeLog 10741
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
-MD5 5f6da5f1fabdf39da22bbb5ea224fab1 files/digest-ethereal-0.10.11 70
-MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
-MD5 5f6da5f1fabdf39da22bbb5ea224fab1 files/digest-ethereal-0.10.11-r1 70
-MD5 a4d5fb3621ed4e86f311718f1447a870 files/fifo.patch 1138
 MD5 34bd8a0285aea402be479f40304aa947 files/digest-ethereal-0.10.12 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLHGej5H05b2HAEkRAozIAJ4tktkyLMOMxutSGRJtgX6B+964wwCghCdT
-LPa8HFe7SMMedeu+rZjASeI=
-=/yz+
------END PGP SIGNATURE-----
+MD5 a4d5fb3621ed4e86f311718f1447a870 files/fifo.patch 1138
+MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
diff --git a/net-analyzer/ethereal/ethereal-0.10.11-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.11-r1.ebuild
deleted file mode 100644 (file)
index 3cf7339..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.11-r1.ebuild,v 1.1 2005/07/19 12:22:08 kaiowas Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~ia64 ~ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-       snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-       >=dev-util/pkgconfig-0.15.0
-       gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-               !gtk2? ( =x11-libs/gtk+-1.2* )
-               x11-libs/pango
-               dev-libs/atk )
-       !gtk? ( =dev-libs/glib-1.2* )
-       ssl? ( >=dev-libs/openssl-0.9.6e )
-       virtual/libpcap
-       >=dev-libs/libpcre-4.2
-       adns? ( net-libs/adns )
-       kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-       dev-lang/perl
-       sys-devel/bison
-       sys-devel/flex
-       sys-apps/sed"
-
-src_unpack() {
-       unpack ${P}.tar.bz2
-
-       # this makes life easy
-       EPATCH_OPTS="-d ${S}"
-
-       EPATCH_SINGLE_MSG="Adding patch to allow use of fifo files as input" \
-       epatch ${FILESDIR}/fifo.patch
-}
-
-src_compile() {
-
-       replace-flags -O? -O
-
-       # Fix gcc-3.4 segfault #49238
-       #[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-       local myconf
-
-       if use gtk; then
-               myconf="${myconf} $(use_enable gtk2)"
-       else
-               myconf="${myconf} --disable-gtk2"
-
-               # the asn1 plugin needs gtk
-               sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-               sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-       fi
-
-       econf \
-               $(use_with ssl) \
-               $(use_enable ipv6) \
-               $(use_with adns) \
-               $(use_with kerberos krb5) \
-               $(use_with snmp net-snmp) \
-               --without-ucd-snmp \
-               --enable-dftest \
-               --enable-randpkt \
-               --sysconfdir=/etc/ethereal \
-               --enable-editcap \
-               --enable-capinfos \
-               --enable-text2pcap \
-               --enable-dftest \
-               --enable-randpkt \
-               ${myconf} || die "bad ./configure"
-
-       # fixes an access violation caused by libnetsnmp - see bug 79068
-       use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-       emake || die "compile problem"
-}
-
-src_install() {
-       dodir /usr/lib/ethereal/plugins/${PV}
-       make DESTDIR=${D} install || die
-
-       dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
-
-       insinto /usr/share/icons/hicolor/16x16/apps
-       newins ${S}/image/hi16-app-ethereal.png ethereal.png
-       insinto /usr/share/icons/hicolor/32x32/apps
-       newins ${S}/image/hi32-app-ethereal.png ethereal.png
-       insinto /usr/share/icons/hicolor/48x48/apps
-       newins ${S}/image/hi48-app-ethereal.png ethereal.png
-       make_desktop_entry ethereal "Ethereal" ethereal
-}
-
-pkg_postinst() {
-       ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws."
-       ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend"
-       ewarn "you take the following security precautions when running ethereal in an untrusted environment:"
-       ewarn "do no run any longer than you need to;"
-       ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;"
-       ewarn "use a hardened operating system;"
-       ewarn "do not listen to addition interfaces;"
-       ewarn "if possible, run behind a firewall;"
-       ewarn "take a capture with tcpdump and analyze the contents offline running ethereal as a the least priviledged user; and"
-       ewarn "subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
-}
diff --git a/net-analyzer/ethereal/ethereal-0.10.11.ebuild b/net-analyzer/ethereal/ethereal-0.10.11.ebuild
deleted file mode 100644 (file)
index 1506262..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.11.ebuild,v 1.12 2005/06/13 19:14:37 blubb Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="A commercial-quality network protocol analyzer"
-HOMEPAGE="http://www.ethereal.com/"
-SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ia64 ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-       snmp? ( >=net-analyzer/net-snmp-5.1.1 )
-       >=dev-util/pkgconfig-0.15.0
-       gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-               !gtk2? ( =x11-libs/gtk+-1.2* )
-               x11-libs/pango
-               dev-libs/atk )
-       !gtk? ( =dev-libs/glib-1.2* )
-       ssl? ( >=dev-libs/openssl-0.9.6e )
-       virtual/libpcap
-       >=dev-libs/libpcre-4.2
-       adns? ( net-libs/adns )
-       kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-       dev-lang/perl
-       sys-devel/bison
-       sys-devel/flex
-       sys-apps/sed"
-
-
-src_compile() {
-
-       replace-flags -O? -O
-
-       # Fix gcc-3.4 segfault #49238
-       #[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
-
-       local myconf
-
-       if use gtk; then
-               myconf="${myconf} $(use_enable gtk2)"
-       else
-               myconf="${myconf} --disable-gtk2"
-
-               # the asn1 plugin needs gtk
-               sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-               sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-       fi
-
-       econf \
-               $(use_with ssl) \
-               $(use_enable ipv6) \
-               $(use_with adns) \
-               $(use_with kerberos krb5) \
-               $(use_with snmp net-snmp) \
-               --without-ucd-snmp \
-               --enable-dftest \
-               --enable-randpkt \
-               --sysconfdir=/etc/ethereal \
-               --enable-editcap \
-               --enable-capinfos \
-               --enable-text2pcap \
-               --enable-dftest \
-               --enable-randpkt \
-               ${myconf} || die "bad ./configure"
-
-       # fixes an access violation caused by libnetsnmp - see bug 79068
-       use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-       emake || die "compile problem"
-}
-
-src_install() {
-       dodir /usr/lib/ethereal/plugins/${PV}
-       make DESTDIR=${D} install || die
-
-       dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
-
-       insinto /usr/share/icons/hicolor/16x16/apps
-       newins ${S}/image/hi16-app-ethereal.png ethereal.png
-       insinto /usr/share/icons/hicolor/32x32/apps
-       newins ${S}/image/hi32-app-ethereal.png ethereal.png
-       insinto /usr/share/icons/hicolor/48x48/apps
-       newins ${S}/image/hi48-app-ethereal.png ethereal.png
-       make_desktop_entry ethereal "Ethereal" ethereal
-}
-
-pkg_postinst() {
-       ewarn "Due to a history of security flaws in this piece of software, it may contain more flaws."
-       ewarn "To protect yourself against malicious damage due to potential flaws in this product we recommend"
-       ewarn "you take the following security precautions when running ethereal in an untrusted environment:"
-       ewarn "do no run any longer than you need to;"
-       ewarn "use in a root jail - prefereably one that has been hardened with grsec like rootjail protections;"
-       ewarn "use a hardened operating system;"
-       ewarn "do not listen to addition interfaces;"
-       ewarn "if possible, run behind a firewall;"
-       ewarn "take a capture with tcpdump and analyze the contents offline running ethereal as a the least priviledged user; and"
-       ewarn "subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
-}
index fe0aa62c66674ff0bc89be38ab492c5d947db458..c460b2b6b8205025ef5701f486efaa1ab64458ca 100644 (file)
@@ -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/ethereal/ethereal-0.10.12.ebuild,v 1.8 2005/07/29 16:51:15 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.9 2005/09/19 19:55:39 vanquirius Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
+IUSE="adns gtk ipv6 snmp ssl kerberos"
 
 # if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
 # --disable-ethereal do not have an influence.
@@ -21,8 +21,8 @@ IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
 RDEPEND=">=sys-libs/zlib-1.1.4
        snmp? ( >=net-analyzer/net-snmp-5.1.1 )
        >=dev-util/pkgconfig-0.15.0
-       gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-               !gtk2? ( =x11-libs/gtk+-1.2* )
+       gtk? ( >=dev-libs/glib-2.0.4
+               =x11-libs/gtk+-2*
                x11-libs/pango
                dev-libs/atk )
        !gtk? ( =dev-libs/glib-1.2* )
@@ -40,8 +40,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${P}-fix-encrypted-conflict.diff
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-fix-encrypted-conflict.diff"
 }
 
 src_compile() {
@@ -54,10 +54,8 @@ src_compile() {
        local myconf
 
        if use gtk; then
-               myconf="${myconf} $(use_enable gtk2)"
+               myconf="${myconf} $(use_enable gtk gtk2)"
        else
-               myconf="${myconf} --disable-gtk2"
-
                # the asn1 plugin needs gtk
                sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
                sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
@@ -88,16 +86,16 @@ src_compile() {
 
 src_install() {
        dodir /usr/lib/ethereal/plugins/${PV}
-       make DESTDIR=${D} install || die
+       make DESTDIR="${D}" install || die
 
        dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
 
        insinto /usr/share/icons/hicolor/16x16/apps
-       newins ${S}/image/hi16-app-ethereal.png ethereal.png
+       newins "${S}"/image/hi16-app-ethereal.png ethereal.png
        insinto /usr/share/icons/hicolor/32x32/apps
-       newins ${S}/image/hi32-app-ethereal.png ethereal.png
+       newins "${S}"/image/hi32-app-ethereal.png ethereal.png
        insinto /usr/share/icons/hicolor/48x48/apps
-       newins ${S}/image/hi48-app-ethereal.png ethereal.png
+       newins "${S}"/image/hi48-app-ethereal.png ethereal.png
        make_desktop_entry ethereal "Ethereal" ethereal
 }
 
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.11 b/net-analyzer/ethereal/files/digest-ethereal-0.10.11
deleted file mode 100644 (file)
index 2203e10..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 5964016
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.11-r1 b/net-analyzer/ethereal/files/digest-ethereal-0.10.11-r1
deleted file mode 100644 (file)
index 2203e10..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 5964016