From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2E951198005 for ; Sun, 10 Mar 2013 00:14:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A875EE05DD; Sun, 10 Mar 2013 00:14:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 306E3E05DD for ; Sun, 10 Mar 2013 00:14:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DADC933DC28 for ; Sun, 10 Mar 2013 00:14:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6D848E4073 for ; Sun, 10 Mar 2013 00:14:06 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1362874418.f3ded781d6e5b9d6a4deca2c38b742e86a672c71.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-3.eclass eclass/mozcoreconf-2.eclass eclass/mozlinguas.eclass eclass/nsplugins.eclass X-VCS-Directories: eclass/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: f3ded781d6e5b9d6a4deca2c38b742e86a672c71 X-VCS-Branch: master Date: Sun, 10 Mar 2013 00:14:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cb45a651-d345-4564-84e9-866a728442f0 X-Archives-Hash: 21c90bee81f56afd5c2277901e5581ee commit: f3ded781d6e5b9d6a4deca2c38b742e86a672c71 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Mar 10 00:13:38 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Mar 10 00:13:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f3ded781 eclasses: Cleanup --- eclass/mozconfig-3.eclass | 2 +- eclass/mozcoreconf-2.eclass | 20 +------------------- eclass/mozlinguas.eclass | 2 +- eclass/nsplugins.eclass | 2 +- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass index b0b8c55..985c0fc 100644 --- a/eclass/mozconfig-3.eclass +++ b/eclass/mozconfig-3.eclass @@ -43,7 +43,6 @@ mozconfig_config() { if ! $(mozversion_is_new_enough) ; then mozconfig_use_enable alsa ogg mozconfig_use_enable alsa wave - mozconfig_use_enable libnotify mozconfig_use_enable debug debugger-info-modules if has +ipc ${IUSE}; then mozconfig_use_enable ipc @@ -61,6 +60,7 @@ mozconfig_config() { fi fi + mozconfig_use_enable libnotify mozconfig_use_enable dbus mozconfig_use_enable debug mozconfig_use_enable debug tests diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass index 30e79de..2f99933 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: $ # # 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} @@ -108,11 +107,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 +124,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 +132,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 +244,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() { diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass index e279a5d..02984d2 100644 --- a/eclass/mozlinguas.eclass +++ b/eclass/mozlinguas.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.3 2012/02/07 15:19:22 polynomial-c Exp $ +# $Header: $ # @ECLASS: mozlinguas.eclass # @MAINTAINER: diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass index d784e6a..a8c41b9 100644 --- a/eclass/nsplugins.eclass +++ b/eclass/nsplugins.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.27 2011/11/21 16:31:49 anarchy Exp $ +# $Header: $ # # @ECLASS: nsplugins.eclass # @MAINTAINER: