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 04C8B138010 for ; Sun, 28 Oct 2012 16:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DF1821C049; Sun, 28 Oct 2012 16:42:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9908321C03D for ; Sun, 28 Oct 2012 16:42:33 +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 CD05833D957 for ; Sun, 28 Oct 2012 16:42:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 77A5AE5441 for ; Sun, 28 Oct 2012 16:42:31 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1351442495.4f20966fead7bca357d3c45451d489c67ed23233.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-crypt/gcr/ X-VCS-Repository: proj/gnome X-VCS-Files: app-crypt/gcr/gcr-3.6.0.ebuild app-crypt/gcr/gcr-3.6.1.ebuild app-crypt/gcr/gcr-9999.ebuild X-VCS-Directories: app-crypt/gcr/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 4f20966fead7bca357d3c45451d489c67ed23233 X-VCS-Branch: master Date: Sun, 28 Oct 2012 16:42:31 +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: 9c997c2f-59c3-4d26-93b6-52c770c0ec0c X-Archives-Hash: cfa18dbbdb06233b34f2b621deca8546 commit: 4f20966fead7bca357d3c45451d489c67ed23233 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 28 16:32:06 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Oct 28 16:41:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4f20966f app-crypt/gcr: 3.6.0 → 3.6.1 Fix USE=debug behavior. We do not disable asserts ever. --- .../gcr/{gcr-3.6.0.ebuild => gcr-3.6.1.ebuild} | 43 ++++++++++--------- app-crypt/gcr/gcr-9999.ebuild | 43 ++++++++++--------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/app-crypt/gcr/gcr-3.6.0.ebuild b/app-crypt/gcr/gcr-3.6.1.ebuild similarity index 74% rename from app-crypt/gcr/gcr-3.6.0.ebuild rename to app-crypt/gcr/gcr-3.6.1.ebuild index 66f1c25..c2a7bca 100644 --- a/app-crypt/gcr/gcr-3.6.0.ebuild +++ b/app-crypt/gcr/gcr-3.6.1.ebuild @@ -16,14 +16,16 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="debug doc +introspection" +IUSE="debug +introspection" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" fi -COMMON_DEPEND=">=app-crypt/gnupg-2 +COMMON_DEPEND=" + >=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.32:2 >=dev-libs/libgcrypt-1.2.2 @@ -33,41 +35,42 @@ COMMON_DEPEND=">=app-crypt/gnupg-2 introspection? ( >=dev-libs/gobject-introspection-1.29 ) " RDEPEND="${COMMON_DEPEND} - !=dev-util/gtk-doc-am-1.9 -pkg_setup() { +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.9 )" +fi + +src_prepare() { DOCS="AUTHORS ChangeLog HACKING NEWS README" G2CONF="${G2CONF} - $(use_enable debug) $(use_enable introspection) + --enable-debug=default --disable-update-icon-cache --disable-update-mime" -} -src_prepare() { - # FIXME: failing tests - # https://bugzilla.gnome.org/show_bug.cgi?id=682651 - if use test; then - sed -e 's:test-subject-public-key::' \ - -e 's:test-system-prompt:$(NULL):' \ - -i gcr/tests/Makefile.am || die "sed failed" - [[ ${PV} = 9999 ]] || eautoreconf + if use debug; then + G2CONF="${G2CONF} --enable-debug=yes" fi + # Disable stupid flag changes + sed -e 's/CFLAGS="$CFLAGS -g"//' \ + -e 's/CFLAGS="$CFLAGS -O0"//' \ + -i configure.ac configure || die + gnome2_src_prepare } diff --git a/app-crypt/gcr/gcr-9999.ebuild b/app-crypt/gcr/gcr-9999.ebuild index 66f1c25..c2a7bca 100644 --- a/app-crypt/gcr/gcr-9999.ebuild +++ b/app-crypt/gcr/gcr-9999.ebuild @@ -16,14 +16,16 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="debug doc +introspection" +IUSE="debug +introspection" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" fi -COMMON_DEPEND=">=app-crypt/gnupg-2 +COMMON_DEPEND=" + >=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.32:2 >=dev-libs/libgcrypt-1.2.2 @@ -33,41 +35,42 @@ COMMON_DEPEND=">=app-crypt/gnupg-2 introspection? ( >=dev-libs/gobject-introspection-1.29 ) " RDEPEND="${COMMON_DEPEND} - !=dev-util/gtk-doc-am-1.9 -pkg_setup() { +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.9 )" +fi + +src_prepare() { DOCS="AUTHORS ChangeLog HACKING NEWS README" G2CONF="${G2CONF} - $(use_enable debug) $(use_enable introspection) + --enable-debug=default --disable-update-icon-cache --disable-update-mime" -} -src_prepare() { - # FIXME: failing tests - # https://bugzilla.gnome.org/show_bug.cgi?id=682651 - if use test; then - sed -e 's:test-subject-public-key::' \ - -e 's:test-system-prompt:$(NULL):' \ - -i gcr/tests/Makefile.am || die "sed failed" - [[ ${PV} = 9999 ]] || eautoreconf + if use debug; then + G2CONF="${G2CONF} --enable-debug=yes" fi + # Disable stupid flag changes + sed -e 's/CFLAGS="$CFLAGS -g"//' \ + -e 's/CFLAGS="$CFLAGS -O0"//' \ + -i configure.ac configure || die + gnome2_src_prepare }