Drop old. Fixed warning reported in bug #350551 by Kacper Kowalik (Xarthisius).

Package-Manager: portage-2.1.9.34/cvs/Linux x86_64

5 files changed, 10 insertions, 383 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 354bb3f551a4..96e08a106fdc 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.271 2011/01/23 13:05:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.272 2011/01/23 13:49:30 pva Exp $
+
+  23 Jan 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.2.12.ebuild,
+  -wireshark-1.4.2.ebuild, wireshark-1.4.3.ebuild:
+  Drop old. Fixed warning reported in bug #350551 by Kacper Kowalik
+  (Xarthisius).
 
   23 Jan 2011; Peter Volkov <pva@gentoo.org> wireshark-1.4.3.ebuild:
   Fixed build issue, bug #349231 again. Thank Nathan Caldwell again...
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e80dd937124d..61f8dad0cca9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,13 +5,9 @@ AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.2.12.tar.gz 19494312 RMD160 e8af01607c182f500ef189be97632e4fc3695e82 SHA1 3cf873315360d566f4c18775046912c58d9f41fe SHA256 67cbf1ad4586facea61180979cedbec422b688d5971e53c125e91836fb94f1b5
 DIST wireshark-1.2.13.tar.gz 19512648 RMD160 ebdc29f83546391cb8eb4056ef686f3ced21215f SHA1 e4a1550a2f98fa49926ed6fe10e2fc28e4bf7221 SHA256 eaa8f3f0eb1b701e3fc5f5e7f8a493df8333a53a25be9dc589cb962dba9cc666
-DIST wireshark-1.4.2.tar.bz2 20208792 RMD160 5f0c1a9c52347782fcdcd6c11e24d21cfe89f7e2 SHA1 03eb2bcd1de93fd0b45d6f1346e97d5f03a47c3e SHA256 44c6e1ec328fa8e1e7b3838b2f25d51c36b38c562fc0d097ba464205fdb049b2
 DIST wireshark-1.4.3.tar.bz2 20469021 RMD160 6a63023f165b2e875296340f6a57595427a13fe7 SHA1 776c757e6a6a085232ac843ec28b026bf4ca9c8d SHA256 3ec9b709ea0e2b26c4d5869374a9013a5c7ca4493f2a2a64640824c5a477eda6
-EBUILD wireshark-1.2.12.ebuild 4573 RMD160 17bd50d666f9b4d77144ddcfdc8f29f1c9eca8f3 SHA1 514105e7cb0c3c8fb5674fe92b87687a8f8342bb SHA256 aaa6626f481386cc001940aa693ead322bfaf9a65cdf8144e91a1c104e935838
 EBUILD wireshark-1.2.13.ebuild 4572 RMD160 db59edd2f293c1ef8d0d2a0ed22f0214941daa21 SHA1 2f732d3a8fb95138804782af65ef1f540356a0d4 SHA256 439a8f83730c05ab2b8c7263b4f09a0b9d418a983439a61c682a2c1ad31dda5d
-EBUILD wireshark-1.4.2.ebuild 6354 RMD160 36300b21839541f994edb04f33febe074e270fbd SHA1 80286171fc1e807980f1c085ea096bba00209e9b SHA256 77b6168e1b833fd737ab9276a09369b710fc037cc4427e3684fb17d4da6b5e3d
-EBUILD wireshark-1.4.3.ebuild 6350 RMD160 1de99200964bed5966b6223128363892978eb718 SHA1 474db59592280ce83f5d37d973598a748f62741a SHA256 abaec4e66a53002c86d544d5ef6ab9288a2687e68779b8e1e08a050bfea2922e
-MISC ChangeLog 39441 RMD160 2b2f19ce581624d64b133b6a94275c0e05a59326 SHA1 dbed7da9a94440bc3ec55f54606bb7430dd128e8 SHA256 e5ed4ba46443c8431ccd62b3d013a84abbdeadd446518b12a84c4a2b15a382a1
+EBUILD wireshark-1.4.3.ebuild 6317 RMD160 7aad7b43aac24ce48ceb01658cda09a3050062ca SHA1 847fd0e606f697cb38595df92486851600146d4d SHA256 7f546b1decb658ba1daca2c129e72f20dc26a00cb8da857a4c7b0ba9a0c37f2d
+MISC ChangeLog 39648 RMD160 e91d239f83bf4c66bd588062aeb731e37e357443 SHA1 efded4625c118c7459587aeddf134e20fc9cb872 SHA256 f9e8fad1058ebf2ee9cf8fe3871d1454db3d27c40b44e1075025f30aea5a57fb
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
diff --git a/net-analyzer/wireshark/wireshark-1.2.12.ebuild b/net-analyzer/wireshark/wireshark-1.2.12.ebuild
deleted file mode 100644
index 8c09cf007898..000000000000
--- a/net-analyzer/wireshark/wireshark-1.2.12.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.12.ebuild,v 1.8 2010/10/25 23:03:58 halcy0n Exp $
-
-EAPI=2
-inherit autotools libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-
-# _rc versions has different download location.
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
-SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
-S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
-SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
-
-RDEPEND=">=dev-libs/glib-2.4.0:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk )
-	gnutls? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk will means no gui called wireshark will be created and"
-		ewarn "only command line utils are available"
-	fi
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_prepare() {
-	cd "${S}"/epan # our hardened toolchain bug...
-	epatch "${FILESDIR}/wireshark-except-double-free.diff"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# optimization bug, see bug #165340, bug #40660
-	if [[ $(gcc-version) == 3.4 ]] ; then
-		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
-		replace-flags -O? -O3
-	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
-		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
-		replace-flags -O? -O
-	fi
-
-	if use ares && use adns; then
-		einfo "You asked for both, ares and adns, but we can use only one of them."
-		einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-	# our hardened toolchain bug
-	filter-flags -fstack-protector
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case `krb5-config --libs` in
-			*-lcrypto*) myconf="${myconf} --with-ssl" ;;
-		esac
-	fi
-
-	# dumpcap requires libcap, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with caps libcap) \
-		$(use_enable pcap setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use pcap && fowners 0:wireshark /usr/bin/dumpcap
-	use pcap && fperms 6550 /usr/bin/dumpcap
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
-
-	if use gtk; then
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		insinto /usr/share/applications
-		doins wireshark.desktop
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
-	ewarn "wireshark group. This security measure ensures that only trusted"
-	ewarn "users allowed to sniff your traffic."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.4.2.ebuild b/net-analyzer/wireshark/wireshark-1.4.2.ebuild
deleted file mode 100644
index fb64b479cd34..000000000000
--- a/net-analyzer/wireshark/wireshark-1.4.2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.2.ebuild,v 1.7 2010/12/21 10:33:25 pva Exp $
-
-EAPI=2
-PYTHON_DEPEND="python? 2"
-inherit libtool flag-o-matic eutils toolchain-funcs python
-
-[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
-profile +pcap pcre portaudio python +caps selinux smi ssl threads zlib"
-
-RDEPEND=">=dev-libs/glib-2.14.0:2
-	zlib? ( sys-libs/zlib
-		!=sys-libs/zlib-1.2.4 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk
-		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt
-		dev-libs/libxml2
-		www-client/elinks
-		app-doc/doxygen
-		doc-pdf? ( dev-java/fop ) )
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-apps/sed
-	sys-devel/flex"
-
-S=${WORKDIR}/${MY_P}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk disables gtk-based gui called wireshark."
-		ewarn "Only command line utils will be built available"
-	fi
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_configure() {
-	local myconf
-
-	if [[ $(gcc-major-version) -lt 3 ||
-		( $(gcc-major-version) -eq 3 &&
-			$(gcc-minor-version) -le 4 ) ]] ; then
-		die "Unsupported compiler version, please upgrade."
-	fi
-
-	if use ares && use adns; then
-		elog "You asked for both, ares and adns, but we can use only one of them."
-		elog "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case `krb5-config --libs` in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=" --with-ssl"
-				;;
-		esac
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with python) \
-		$(use_with caps libcap) \
-		$(use pcap && use_enable caps setcap-install) \
-		$(use pcap && use_enable !caps setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		--with-dumpcap-group=wireshark \
-		--disable-extra-gcc-checks \
-		${myconf}
-}
-
-src_compile() {
-	emake || die
-	use doc && cd docbook && { emake || die; }
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-#		for dir in ws{d,u}g_html{,_chunked}; do
-#			dohtml -p ${dir} -r docbook/${dir}/ || die
-#		done
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf || die
-		fi
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h || die
-
-	if use gtk; then
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		insinto /usr/share/applications
-		doins wireshark.desktop || die
-	fi
-}
-
-pkg_postinst() {
-	if use caps && use pcap; then
-		fcaps 0:wireshark 550 cap_net_raw,cap_net_admin "${ROOT}"/usr/bin/dumpcap
-	fi
-	echo
-	ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
-	ewarn "the wireshark group. This security measure ensures that only trusted"
-	ewarn "users are allowed to sniff your traffic."
-	echo
-}
diff --git a/net-analyzer/wireshark/wireshark-1.4.3.ebuild b/net-analyzer/wireshark/wireshark-1.4.3.ebuild
index 703848dc00bb..f5327c4a4025 100644
--- a/net-analyzer/wireshark/wireshark-1.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.3.ebuild,v 1.5 2011/01/23 13:05:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.3.ebuild,v 1.6 2011/01/23 13:49:30 pva Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2"
@@ -200,8 +200,7 @@ src_install() {
 				newins image/${c}${d}-app-wireshark.png wireshark.png
 			done
 		done
-		insinto /usr/share/applications
-		doins wireshark.desktop || die
+		domenu wireshark.desktop || die
 	fi
 }