Respect USE=-introspection (bug #434412, thanks to Sergey Golubev and Ben Longbons). Drop revisions that didn't.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

3 files changed, 10 insertions, 70 deletions

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index 65945483f978..0e1a3fbe2180 100644
--- a/app-crypt/gcr/ChangeLog
+++ b/app-crypt/gcr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gcr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.3 2012/09/10 06:15:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.4 2012/09/10 17:28:21 tetromino Exp $
+
+*gcr-3.4.1-r2 (10 Sep 2012)
+
+  10 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gcr-3.4.1.ebuild,
+  -gcr-3.4.1-r1.ebuild, +gcr-3.4.1-r2.ebuild:
+  Respect USE=-introspection (bug #434412, thanks to Sergey Golubev and Ben
+  Longbons). Drop revisions that didn't.
 
 *gcr-3.4.1-r1 (10 Sep 2012)
 
diff --git a/app-crypt/gcr/gcr-3.4.1-r1.ebuild b/app-crypt/gcr/gcr-3.4.1-r2.ebuild
index 0ff4a2b590c1..8c8bf7183fa6 100644
--- a/app-crypt/gcr/gcr-3.4.1-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.4.1-r2.ebuild
@@ -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/app-crypt/gcr/gcr-3.4.1-r1.ebuild,v 1.1 2012/09/10 06:15:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.4.1-r2.ebuild,v 1.1 2012/09/10 17:28:21 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -46,6 +46,7 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable debug)
+		$(use_enable introspection)
 		--disable-update-icon-cache
 		--disable-update-mime"
 }
diff --git a/app-crypt/gcr/gcr-3.4.1.ebuild b/app-crypt/gcr/gcr-3.4.1.ebuild
deleted file mode 100644
index e8a4c96d96ad..000000000000
--- a/app-crypt/gcr/gcr-3.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.4.1.ebuild,v 1.2 2012/07/16 08:31:14 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2 virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="debug doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.6
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1
-	>=sys-apps/dbus-1.0
-	>=x11-libs/gtk+-3.0:3
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.9
-
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		--disable-update-icon-cache
-		--disable-update-mime"
-}
-
-src_prepare() {
-	# FIXME: failing tests
-	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"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}