diff options
author | Eldad Zack <eldad@gentoo.org> | 2004-07-14 19:14:13 +0000 |
---|---|---|
committer | Eldad Zack <eldad@gentoo.org> | 2004-07-14 19:14:13 +0000 |
commit | 8b244da1c511bcbc3ade62eb619456f850f24c17 (patch) | |
tree | 96b721bd701a8629c2db900cb1d5b8e83779d2db /net-analyzer | |
parent | sync IUSE (missing), don't assign S=${WORKDIR}/${P} (diff) | |
download | historical-8b244da1c511bcbc3ade62eb619456f850f24c17.tar.gz historical-8b244da1c511bcbc3ade62eb619456f850f24c17.tar.bz2 historical-8b244da1c511bcbc3ade62eb619456f850f24c17.zip |
gtk/gtk2 issue, closes 57022
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/ethereal/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/ethereal/Manifest | 18 | ||||
-rw-r--r-- | net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild | 18 | ||||
-rw-r--r-- | net-analyzer/ethereal/ethereal-0.10.5.ebuild | 18 |
4 files changed, 39 insertions, 21 deletions
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog index e176d92238d1..9ba38e0bfe02 100644 --- a/net-analyzer/ethereal/ChangeLog +++ b/net-analyzer/ethereal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/ethereal # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.77 2004/07/09 21:51:57 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.78 2004/07/14 19:14:13 eldad Exp $ + + 14 Jul 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5-r1.ebuild, + ethereal-0.10.5.ebuild: + Fixed -gtk +gtk2 dependency issue. Closes #57022. 09 Jul 2004; Lars Weiler <pylon@gentoo.org> ethereal-0.10.5-r1.ebuild: Stable on ppc. diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest index e0d996ae17a1..68971e4fd9d9 100644 --- a/net-analyzer/ethereal/Manifest +++ b/net-analyzer/ethereal/Manifest @@ -1,8 +1,18 @@ -MD5 b94db851e0c8d93cf136b551e4a3d098 ChangeLog 10906 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 e50b7468589f5afe01962b71db699c12 ethereal-0.10.5.ebuild 2477 +MD5 d08324fc74dfecaac0f41bd896cdca66 ChangeLog 11057 +MD5 925f9bf49624b9ec090c461ea364f81f ethereal-0.10.5-r1.ebuild 2589 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224 -MD5 76e820db2186c87fd037ba6f8b0ecd02 ethereal-0.10.5.ebuild 2538 -MD5 09db7c796c15ceb7ba32a467fd894669 ethereal-0.10.5-r1.ebuild 2649 MD5 5a73274ec255373b4e618388cd057275 files/0.10.3-gcc34.patch 458 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458 -MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69 +MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.4 (GNU/Linux) + +iD8DBQFA9YWLT+MN7JbqCpMRAuqlAJ9WQO7M9QptIJkyPIw3X1s21mKGtQCfev0H +0xFEXbPHCHj5fJynW5C3nEU= +=OLWG +-----END PGP SIGNATURE----- diff --git a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild index 1f2653382a98..53ceaa1213f8 100644 --- a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild +++ b/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild,v 1.3 2004/07/09 21:51:57 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild,v 1.4 2004/07/14 19:14:13 eldad Exp $ inherit libtool flag-o-matic gcc eutils @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="~x86 ~sparc ppc ~alpha ~amd64 ~ia64" IUSE="adns gtk ipv6 snmp ssl gtk2" -# since if --disable-gtk2 is not passed to configure it will try to build with glib-2.0, -# the logic is reversed. if gtk2 USE flag is on, gtk2 will be built, even if gtk is not in USE. +# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0. # --disable-ethereal do not have an influence. # snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp ) @@ -22,8 +21,8 @@ IUSE="adns gtk ipv6 snmp ssl gtk2" RDEPEND=">=sys-libs/zlib-1.1.4 snmp? ( >=net-analyzer/net-snmp-5.1.1 ) >=dev-util/pkgconfig-0.15.0 - gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) - gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* ) ) + gtk? ( gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) + !gtk2? ( =x11-libs/gtk+-1.2* ) ) !gtk? ( =dev-libs/glib-1.2* ) ssl? ( >=dev-libs/openssl-0.9.6e ) >=net-libs/libpcap-0.7.1 @@ -52,10 +51,13 @@ src_compile() { local myconf=" $(use_with ssl) $(use_enable ipv6) - $(use_with adns) - $(use_enable gtk2)" + $(use_with adns)" + + if use gtk; then + myconf="$(use_enable gtk2)" + else + myconf="--disable-gtk2" - if ! use gtk; then # --disable-ethereal do not have an influence #myconf="${myconf} --disable-ethereal" # the asn1 plugin needs gtk diff --git a/net-analyzer/ethereal/ethereal-0.10.5.ebuild b/net-analyzer/ethereal/ethereal-0.10.5.ebuild index 0f88b60fbae4..91d30c08baf9 100644 --- a/net-analyzer/ethereal/ethereal-0.10.5.ebuild +++ b/net-analyzer/ethereal/ethereal-0.10.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5.ebuild,v 1.6 2004/07/09 19:56:45 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5.ebuild,v 1.7 2004/07/14 19:14:13 eldad Exp $ inherit libtool flag-o-matic gcc eutils @@ -13,15 +13,14 @@ SLOT="0" KEYWORDS="x86 sparc ppc alpha amd64 ~ia64" IUSE="adns gtk ipv6 snmp ssl gtk2" -# since if --disable-gtk2 is not passed to configure it will try to build with glib-2.0, -# the logic is reversed. if gtk2 USE flag is on, gtk2 will be built, even if gtk is not in USE. +# 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? ( virtual/snmp ) >=dev-util/pkgconfig-0.15.0 - gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) - gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* ) ) + gtk? ( gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) + !gtk2? ( =x11-libs/gtk+-1.2* ) ) !gtk? ( =dev-libs/glib-1.2* ) ssl? ( >=dev-libs/openssl-0.9.6e ) >=net-libs/libpcap-0.7.1 @@ -50,10 +49,13 @@ src_compile() { local myconf=" $(use_with ssl) $(use_enable ipv6) - $(use_with adns) - $(use_enable gtk2)" + $(use_with adns)" + + if use gtk; then + myconf="$(use_enable gtk2)" + else + myconf="--disable-gtk2" - if ! use gtk; then # --disable-ethereal do not have an influence #myconf="${myconf} --disable-ethereal" # the asn1 plugin needs gtk |