Version bump for gnome-3.6. Update license. Drop useless doc USE flag. Switch to global introspection USE flag.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 82 insertions, 16 deletions

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index a12d3c3fb72d..33fb6928be9c 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.8 2012/11/21 11:00:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.9 2012/12/16 09:37:51 tetromino Exp $
+
+*gcr-3.6.2 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gcr-3.4.1-r2.ebuild,
+  +gcr-3.6.2.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Update license. Drop useless doc USE flag. Switch
+  to global introspection USE flag.
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> gcr-3.4.1-r2.ebuild:
   Stable for x86, wrt bug #439152
diff --git a/app-crypt/gcr/gcr-3.4.1-r2.ebuild b/app-crypt/gcr/gcr-3.4.1-r2.ebuild
index 36822d3ccfc4..7f1e7c8975c1 100644
--- a/app-crypt/gcr/gcr-3.4.1-r2.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-r2.ebuild,v 1.5 2012/11/21 11:00:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.4.1-r2.ebuild,v 1.6 2012/12/16 09:37:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit autotools gnome2 virtualx
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="debug doc +introspection"
+IUSE="debug +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
@@ -30,28 +30,23 @@ RDEPEND="${COMMON_DEPEND}
 # gcr was part of gnome-keyring until 3.3
 DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
 	>=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 )"
+	dev-libs/gobject-introspection-common"
 # eautoreconf needs:
 #	dev-libs/gobject-introspection-common
-#	>=dev-util/gtk-doc-am-1.9
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable introspection)
 		--disable-update-icon-cache
 		--disable-update-mime"
-}
 
-src_prepare() {
 	epatch "${FILESDIR}/${P}-invalid-whitespace.patch" #434422
 
 	# FIXME: failing tests
diff --git a/app-crypt/gcr/gcr-3.6.2.ebuild b/app-crypt/gcr/gcr-3.6.2.ebuild
new file mode 100644
index 000000000000..34b59150a339
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.6.2.ebuild
@@ -0,0 +1,68 @@
+# 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.6.2.ebuild,v 1.1 2012/12/16 09:37:51 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/3.1" # subslot = 3.suffix of libgcr-3
+IUSE="debug +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.32: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-libs/gobject-introspection-common
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+
+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 introspection)
+		$(usex debug --enable-debug=yes --enable-debug=default)
+		--disable-update-icon-cache
+		--disable-update-mime"
+
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
index 14e9fc116023..da6fd63d0085 100644
--- a/app-crypt/gcr/metadata.xml
+++ b/app-crypt/gcr/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="introspection">Use
-	<pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-</use>
 </pkgmetadata>