Cleanup of obsolete options, address bug #446662,460592

3 files changed, 11 insertions, 23 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 69f8cedd1217..f835a44cbde8 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.752 2013/03/23 21:18:25 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.753 2013/03/24 19:08:58 anarchy Exp $
+
+  24 Mar 2013; Jory A. Pratt <anarchy@gentoo.org> mozconfig-3.eclass mozcoreconf-2.eclass:
+  Cleanup of obsolete options, address bug #446662,460592
 
   23 Mar 2013; Julian Ospald <hasufell@gentoo.org> unpacker.eclass:
   add unpack_zip function to unpacker.eclass wrt #462612
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index c5e57accb55b..c8b2ef608666 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.34 2013/01/16 23:57:37 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.35 2013/03/24 19:08:58 anarchy Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -17,7 +17,6 @@ RDEPEND="app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.2
 	dev-libs/expat
-	>=dev-libs/libIDL-0.8.0
 	>=dev-libs/libevent-1.4.7
 	>=x11-libs/cairo-1.8[X]
 	>=x11-libs/gtk+-2.8.6:2
diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
index 30e79dec0768..39d1cbbcb0df 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.27 2013/01/16 19:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.28 2013/03/24 19:08:58 anarchy Exp $
 #
 # mozcoreconf.eclass : core options for mozilla
 # inherit mozconfig-2 if you need USE flags
@@ -14,7 +14,6 @@ IUSE="${IUSE} custom-cflags custom-optimization"
 
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
-	x11-libs/libXmu
 	>=sys-libs/zlib-1.1.4"
 
 DEPEND="${RDEPEND}
@@ -95,6 +94,10 @@ moz_pkgsetup() {
 	export USE_PTHREADS=1
 	export ALDFLAGS=${LDFLAGS}
 
+	# nested configure scripts in mozilla products generate unrecognized options
+	# false positives when toplevel configure passes downwards.
+	export QA_CONFIGURE_OPTIONS=".*"
+
 	if [[ $(gcc-major-version) -eq 3 ]]; then
 		ewarn "Unsupported compiler detected, DO NOT file bugs for"
 		ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
@@ -108,11 +111,8 @@ mozconfig_init() {
 	declare enable_optimize pango_version myext x
 	declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
 	declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
-	declare IC=$([[ ${PN} == icecat ]] && echo true || echo false)
 	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
 	declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
-	declare EM=$([[ ${PN} == enigmail ]] && echo true || echo false)
-
 
 	####################################
 	#
@@ -128,9 +128,6 @@ mozconfig_init() {
 		*firefox)
 			cp browser/config/mozconfig .mozconfig \
 				|| die "cp browser/config/mozconfig failed" ;;
-		*icecat)
-			cp browser/config/mozconfig .mozconfig \
-				|| die "cp browser/config/mozconfig failed" ;;
 		seamonkey)
 			# Must create the initial mozconfig to enable application
 			: >.mozconfig || die "initial mozconfig creation failed"
@@ -139,9 +136,6 @@ mozconfig_init() {
 			# Must create the initial mozconfig to enable application
 			: >.mozconfig || die "initial mozconfig creation failed"
 			mozconfig_annotate "" --enable-application=mail ;;
-		enigmail)
-			cp mail/config/mozconfig .mozconfig \
-				|| die "cp mail/config/mozconfig failed" ;;
 	esac
 
 	####################################
@@ -254,14 +248,6 @@ mozconfig_init() {
 	! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc
 }
 
-makemake2() {
-	for m in $(find ../ -name Makefile.in); do
-		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
-		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
-			< ${m} > ${m%.in} || die "sed ${m} failed"
-	done
-}
-
 # mozconfig_final: display a table describing all configuration options paired
 # with reasons, then clean up extensions list
 mozconfig_final() {