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

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 19 insertions, 80 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/Manifest b/app-crypt/gcr/Manifest
index dd0e6e9ac50b..aa5a02244c61 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,18 +3,17 @@ Hash: SHA256
 
 AUX gcr-3.4.1-invalid-whitespace.patch 1752 SHA256 ec744e55714d7f700dd8179f3c365da9a9538e9866be4f0616ffd880ff3a8a02 SHA512 f4bf4e8643b5a7be9cbb2173ff6bd9ecde542e1bf6d65752104b1727fc315faba647cf1d867130d9e5193b3cdaad911fdc1b5935bc84949e5723d31abdc2da57 WHIRLPOOL 7b423338f123ffc89f34b2441098e745ab38dd59290a65e046be205ff0d5f3d8017cdb694959fe1077d3cd20768272d6fbcb28c4b3169d4f61cfcd15e4d3dc4e
 DIST gcr-3.4.1.tar.xz 1335160 SHA256 a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609 SHA512 bfd298b2fe52a97bcae6988b865dbe4f43ade209531cb5ddeebbd4a5f9ac3310f2bf9aebfc6101da63b2db427b8d4b822d3711693ab91a6227f632a7d9189874 WHIRLPOOL 01386f8b140f99861c9dc24b25dc675b862d851ef31cae94ac071d30701e5fc357fb7d763c23ba0d64578fb0f2ece36ec087302e356aafb3f9abe1b53a1f936a
-EBUILD gcr-3.4.1-r1.ebuild 1777 SHA256 39c0d99f9b41a8081110acaddd1ce6df44f2eae0c3007e95615cce6ccdf39c11 SHA512 2302b02127d593356b48f8cb7e037e365be3e7fb6c9c2449f6637177422c5b18925d74f2520400454b1f46b3d13e809fd74b22101a1bd05c7ffab9ccb0ad9281 WHIRLPOOL 318479b2139feb45c748e9a06724d2f6de7c4f120f69f5e9395cd3053a27308a636fe8fee10f20a72186b68e83921eaac82608f8586ba6a51232308c37598acf
-EBUILD gcr-3.4.1.ebuild 1713 SHA256 c78508d95d71928eb7df3cd65f9e89d273db79b1d5059bb0bd9dd6ba1f308205 SHA512 b0f6195fc5352f7a507f36e094d9fd2c72fb034e3fdb629093f9ff13edcd9c837422f25075c15b94df58bf6606d363dc8e4c6d99b212f5bf621ca762ae7cc05e WHIRLPOOL 75f79a6c64f900f04c707f24e26f8ffe709f1a2ff0f009a7ec81333a81a66cc64094437ced5d152fb1ae0aa96b8400e29eadfe92b9bd1af87accf139780c77ac
-MISC ChangeLog 790 SHA256 689aa7d38c9840547d064208fc16041a2508899dc57e9cb73ad06b1258578038 SHA512 4da953749205c546bd51b3dff1261448ae7dddc85559ada406ea707477745be396f0a1ee9a948984f4ff1d24ec1311b1b228b7116706a03910113348359b8c5d WHIRLPOOL 54cfffd6ebd0889aa871bb298ee88a5fae879f35cb8a43d597d976aefa8fe6794d94486c1c7f395d25429274c4091cbaec557b666866c7e9a73be4a5e986840d
+EBUILD gcr-3.4.1-r2.ebuild 1807 SHA256 8ea44a33276e42622eb1b16b9e125bfedaa565f4c2424932e11bc88bf0affb8f SHA512 b4a86cf030dfe26f5bca862394aaf2a1bd85dc9859a16c2366e1b8a35dc7a52e4c8767e574c4427b0a07960bace70914535ed9da168ee94378d16bf35573ed2d WHIRLPOOL 8eea2d13f43d9f749e4b283fe65266e6aa2a1b93af5771d5c21a01a1302cda0b9c86b6bee9923c281ed9d8bf087a60d6957488f6b112bc760b0c95faa1505565
+MISC ChangeLog 1061 SHA256 234834392e692beb7b59d1544aa0981d3b93267f1f618c9cc054003e19806601 SHA512 4e2dba28abc5ea1324fef3a83ca720194855c8fe962b06b322df285a9c598c1902cdb831fee9193046dbbd4b6bfff404a114dc4b5751c98859bfcecfbade73df WHIRLPOOL 2a091074a463f8192050b5acace29a3983655f2a1c8257fd9e8845a3494e401de8330241c66f9462df93c2a14c527119d1fe9508aba0939b5573d5125232969b
 MISC metadata.xml 271 SHA256 091ef40c3b351c464d5718aee2e63cc81da0674a41a052d2c3a0a247b548ea88 SHA512 a21990383917e958e8c7e1a056860d11388214d655d2cdccd4ad7d180611be6bafb8f6072be77ce4b06b75f270c334060e6d6b8725abd398085a0cdea6734bb2 WHIRLPOOL abf45cd0ca93bafdff90f73833599346316018bb3c7a5339d7d8d7965be9d0b5e4098d1074099dbda2a8e270b111d8a18ed752f8a87873c8b2aebfec10241c3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQTYVsAAoJEJ0WA1zPCt1hrw4H/3uJPn9oV8oP6GQHWW0+IRY+
-5S6ea0DolIaAsaiaAwaLSvg784NR51OKggy6+SOIMUgLZ2T7QhYFqCbz1+eWmQuv
-oy9sPNTl43WDfEb4GKjWY793ziOI/D+ekuSbEyR+bSFGQgOezUNKB5+wuqvAgAH6
-hmnYywP5gs/ipRYQEaKFCsaG9mOjoH3xip3/JJ3aw/Rrv/Qd5y+NbjBS+Ke5wJEH
-TtFKgkYEiZy+EXbOT9CI+IQ/AnvBbU6DG0XDFGkDcftx/ymt+A4HAqRIMKRYtQj6
-bU6Xx4R6DseeQuG1ubj5uTTeNIgPo/Iu3ZBRwQWzZxATUAPjor922OLadKvdm/U=
-=GJiX
+iQEcBAEBCAAGBQJQTiM7AAoJEJ0WA1zPCt1hXeYH/jTstW6p0Em/1rVGbv2p8iXA
+X/g/eDY74JMLLXWcQ5Tc34qN9cfiHZWVQGOnYusFOEyA7AIKO5/yLo/2fKLhFXXe
+mN7x2T7DL103LhUD2FnBGoA1l3xwKcRSIa7rwWFnedUP35kZCTCkH2dbfTr+d199
+vwKxHE34UKrAjxmFlI3bkabVoksaLCPsuotLUGmXmzbsmk3heajUdg1dSvRY4+0w
+I4w2gQtq0M2laK9EGi+0JbYykRz+/TMisNyg0vs9c73O0JnkJqq45rH46te9iuPT
+/CaBj/XkYrGL2/YL8K3t2FYvVhSfg44dR35FVe1GTwFxxzwKh9R8n/tFqk6NymU=
+=VEDF
 -----END PGP SIGNATURE-----
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
-}