Fix instrospection dependency (#516700 by darkdimius), drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 88 deletions

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index dab304635768..2d701b6ee835 100644
--- a/app-crypt/gcr/ChangeLog
+++ b/app-crypt/gcr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gcr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.36 2014/05/30 19:21:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.37 2014/07/09 09:29:39 pacho Exp $
+
+  09 Jul 2014; Pacho Ramos <pacho@gentoo.org> -gcr-3.12.0.ebuild,
+  gcr-3.12.2.ebuild:
+  Fix instrospection dependency (#516700 by darkdimius), drop old
 
 *gcr-3.12.2 (30 May 2014)
 
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 3b68e33b3dea..340926672a23 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
-DIST gcr-3.12.0.tar.xz 1335728 SHA256 9d561d0b0a43aaad55fc1d464b3ee3e1687a5021e444f1bbdce3ae624518de77 SHA512 a38a7d084f77bff5b26546bc0bca61e53b0b0a0ae9470a42b61ac12c9a0b755a763171d27d01ffbeda3c04a3d6e9cadc61f5875576d02efacfab112427834990 WHIRLPOOL fc5743c81c4062b79a58c272265f2660be66739796e02eeb241d4340b3f31325fa58c49ed478fa5e9986465e895a1d316850dacfe9a94cc0472cdee0b39c8337
 DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
 EBUILD gcr-3.10.1.ebuild 1907 SHA256 e2031af77b388bd8aa37f72b260a761231d16963149eeebaaeecd7c82d872fb7 SHA512 f99a36fb3330e1a0adaed37091f9c499d0d158cb2258fbfe2269fd0a82d503e61256bce126ddd7db64316d20ec60246a27d543d5effb0ee16d35e87243c981aa WHIRLPOOL 6ab46d68017f0589f75b10077c8c9449810ab2ac6f4ff73ccc84cae977a3fe7f24c2c99907018d537ef30e963dd457ab5ca866e3d70e243fdc4b24b6356905b0
-EBUILD gcr-3.12.0.ebuild 2032 SHA256 691ca38fda90f9d53586d41d944c919645b1373c3f10429278c5c9622ed356dc SHA512 927aa5310069c3683f2d606f2fd4962b235afda1836651b23683d03a1ecead6bc4e0a1bb8bde75ece48162d0a178ef39515f5982bc89942cfb187fcba45a4400 WHIRLPOOL 910a4d5313af10d5b043496b7a55abd54012bcd2282f654f6fa6e343f9ab1764a9ba9cfde4b2d375641a38ee9d72bbd7245c691c84914e2089ef6f8dd339cda6
-EBUILD gcr-3.12.2.ebuild 2034 SHA256 de60ccb82dbe01845df3d519086894bc0a7a0079c24e43891c91ddb73b61347f SHA512 a3210cba04e37979aac667b6d6428758dd079c797e4caafbc63050371d97830727f809571bf6ae3f4cbd43bf633458bc1a8d3be8d8a11cd8ea0365d885e3ff93 WHIRLPOOL be9f22008f17beaab36cd7dfb53666d8a21ea5d36f5b776a8e63edbaad45eb326a115bce72f3f77e8a0f7f55fdd802f41ffb50f14368525fc4fd9f1046a779bf
-MISC ChangeLog 4759 SHA256 586447e902c217cb4ac4b9934bb3fc31ed452bb12d7ed0caad438c6f32a5799b SHA512 d9e86be99dae1815af0665e8987f06fdbc6811769b59fa552f8afb09cf6de7dbd8266b2ed3e9358ee3dc9c87f9ec92c560a4c0889210e22d259034225bfaed4b WHIRLPOOL 59b268cf4819bf6973f3945578396372287a485f1e57dcc1ca75b405727001c8338134b6a19472951deba585c9c9e394ff7e59df1c6e161e75d55aebf04ff8c5
+EBUILD gcr-3.12.2.ebuild 2050 SHA256 8ff391ca6eae035bd14676332c3b086eff479aca4398983e23869efb7f23a110 SHA512 5e413fb82ecc312e5491357025c32114025d05f4d83a4b20e0a3b8896ae4176a9fb664486a9bc606d5cd5694e421e1cdb3d3fc6ba147aab0d3dd81b65e78c64b WHIRLPOOL ffd33f117fe120a4616f38dc3330a5c0256f78201cac8637449eb151568e7aee8fe2563315f4453f1e7d2a70ae174f95ae7f2255ccb31bcfd7cdc141c760bae8
+MISC ChangeLog 4913 SHA256 ad9aa20ff76de1f96d7bc46101a087b94deda4461c11d10ef3918dc4ede00eb6 SHA512 29bb90f7e02a99560b342a897f84a6c824b64707558bfea2b5e7ef8f987ee2b59a971f16a282e46288b8904c2dfb67edead12658f22f5aae164dc679025273eb WHIRLPOOL f2c6a9940d035d589b0d8c9df154881b044954c71a81b79e0e1b2b94e614931bb00a665d9c93a8dee7ebd9eb69b9a33cf0fb6bddb202a1154e7dc28f3255d61d
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOI2kMACgkQCaWpQKGI+9T5cgCeIS4fdyeMLcnCCnLve9j7AM7m
-xsgAniWawLb8ML/eZ2b3IsMEFh3RCti5
-=X6r9
+iEYEAREIAAYFAlO9C4QACgkQCaWpQKGI+9TPzACfTm1TjUuQYQaERMEkL7LKOdyb
+RwAAnRsoKDKg/+aoPT2I2pyRxq1sTLcF
+=Dch+
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gcr/gcr-3.12.0.ebuild b/app-crypt/gcr/gcr-3.12.0.ebuild
deleted file mode 100644
index c752f5c39b56..000000000000
--- a/app-crypt/gcr/gcr-3.12.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.12.0.ebuild,v 1.1 2014/04/27 15:25:24 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://developer.gnome.org/gcr/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.34 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
diff --git a/app-crypt/gcr/gcr-3.12.2.ebuild b/app-crypt/gcr/gcr-3.12.2.ebuild
index 0d333e04231d..034a5bf771c9 100644
--- a/app-crypt/gcr/gcr-3.12.2.ebuild
+++ b/app-crypt/gcr/gcr-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.12.2.ebuild,v 1.1 2014/05/30 19:21:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.12.2.ebuild,v 1.2 2014/07/09 09:29:38 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.2:0=
 	>=dev-libs/libtasn1-1:=
 	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3:3 )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-1.34 )
 "
 RDEPEND="${COMMON_DEPEND}