Abort if perl is compiled with USE=minimal. Fixes bug Bug 98858.

(Portage version: 2.0.54)

4 files changed, 34 insertions, 18 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index b5821617df35..8b9a3f15a328 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -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.166 2005/12/30 16:42:28 ferdy Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.167 2006/01/16 19:11:52 vanquirius Exp $
+
+  16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  ethereal-0.10.13-r2.ebuild, ethereal-0.10.14.ebuild:
+  Abort if perl is compiled with USE=minimal. Fixes bug Bug 98858. Thanks to
+  Romary Sonrier <romary dot sonrier at free dot fr>.
 
   30 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
   ethereal-0.10.14.ebuild:
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 16c88c6ab29b..b42ab82332cf 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6d35a8c18c29226a305884d8831c11ad ChangeLog 14817
-MD5 5f3d88072d2dfab31a28b37171489024 ethereal-0.10.13-r2.ebuild 3500
-MD5 dfae77eda4219b1dafbe9aa49e33d65d ethereal-0.10.14.ebuild 3284
+MD5 f0a14c5ae6d91ea30c8a2e08b0f05a1e ethereal-0.10.13-r2.ebuild 3787
+MD5 627021cafd6fb74c2ad0fb4e4a58e86a ethereal-0.10.14.ebuild 3572
 MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13-r2 70
 MD5 006b9cf78002e82c2bb4e279f50e3429 files/digest-ethereal-0.10.14 70
 MD5 e58b082ef143490cd14bbd423d5e7f4d files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff 612
 MD5 c334d7d6daae506c1e3a9a61d892a00c files/ethereal-0.10.13-packet-ospf.diff 18115
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtWOJViELBEf1JB0RAvj7AJ9Cno9vUSPoF5goXu+RN8BbUPqv4wCaAq+f
-rGgRZYc+9nbyzOcjgeKs564=
-=ZqV6
------END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild b/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild
index 16f40aca6d8a..b9c42c652124 100644
--- a/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild,v 1.7 2005/12/13 20:19:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13-r2.ebuild,v 1.8 2006/01/16 19:11:52 vanquirius Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -34,6 +34,16 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-apps/sed"
 
+pkg_setup() {
+	# bug 119208
+	if built_with_use dev-lang/perl minimal ; then
+		ewarn "ethereal will not build if dev-lang/perl is compiled with"
+		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
+		ebeep 5
+		die "dev-lang/perl compiled with USE=minimal"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/net-analyzer/ethereal/ethereal-0.10.14.ebuild b/net-analyzer/ethereal/ethereal-0.10.14.ebuild
index 60b9daa33b6d..e003e523cb35 100644
--- a/net-analyzer/ethereal/ethereal-0.10.14.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.14.ebuild,v 1.7 2005/12/30 16:42:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.14.ebuild,v 1.8 2006/01/16 19:11:52 vanquirius Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -33,6 +33,17 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-apps/sed"
 
+pkg_setup() {
+	# bug 119208
+	if built_with_use dev-lang/perl minimal ; then
+		ewarn "ethereal will not build if dev-lang/perl is compiled with"
+		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
+		ebeep 5
+		die "dev-lang/perl compiled with USE=minimal"
+	fi
+}
+
+
 src_compile() {
 
 	replace-flags -O? -O