Version bump for Gnome 3.6. Bump to EAPI=5 and fix licences. Drop old revisions. USE=introspection is now global.

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

4 files changed, 31 insertions, 27 deletions

diff --git a/x11-libs/libcryptui/ChangeLog b/x11-libs/libcryptui/ChangeLog
index a5838dc147e8..6b4889af5366 100644
--- a/x11-libs/libcryptui/ChangeLog
+++ b/x11-libs/libcryptui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libcryptui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.4 2012/05/13 18:18:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.5 2012/12/23 17:28:27 eva Exp $
+
+*libcryptui-3.6.0 (23 Dec 2012)
+
+  23 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -libcryptui-3.2.2.ebuild,
+  libcryptui-3.4.1.ebuild, +libcryptui-3.6.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Bump to EAPI=5 and fix licences. Drop old
+  revisions. USE=introspection is now global.
 
 *libcryptui-3.4.1 (13 May 2012)
 
diff --git a/x11-libs/libcryptui/libcryptui-3.4.1.ebuild b/x11-libs/libcryptui/libcryptui-3.4.1.ebuild
index fa5e96a38f0b..d65894790e54 100644
--- a/x11-libs/libcryptui/libcryptui-3.4.1.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.4.1.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/x11-libs/libcryptui/libcryptui-3.4.1.ebuild,v 1.1 2012/05/13 18:18:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.4.1.ebuild,v 1.2 2012/12/23 17:28:27 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="User interface components for OpenPGP"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
 IUSE="debug doc +introspection libnotify test"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
diff --git a/x11-libs/libcryptui/libcryptui-3.2.2.ebuild b/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
index 262decefe422..a2b6cff8e037 100644
--- a/x11-libs/libcryptui/libcryptui-3.2.2.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.2.2.ebuild,v 1.2 2012/05/05 03:52:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.6.0.ebuild,v 1.1 2012/12/23 17:28:27 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,17 +11,19 @@ inherit gnome2
 DESCRIPTION="User interface components for OpenPGP"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
-IUSE="debug doc +introspection libnotify test"
+IUSE="+introspection libnotify test"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3:3[introspection?]
 	>=dev-libs/dbus-glib-0.72
 	>=gnome-base/gnome-keyring-2.91.2
+	x11-libs/libICE
+	x11-libs/libSM
 
 	>=app-crypt/gpgme-1
 	|| (
@@ -32,28 +34,17 @@ COMMON_DEPEND="
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 "
 DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
 	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
+	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )
+	sys-devel/gettext
+	virtual/pkgconfig
 "
 # Before 3.1.4, libcryptui was part of seahorse
 RDEPEND="${COMMON_DEPEND}
 	!<app-crypt/seahorse-3.1.4
 "
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-update-mime-database
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable libnotify)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
 src_prepare() {
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
@@ -62,3 +53,13 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-update-mime-database
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable test tests)"
+	gnome2_src_configure
+}
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index b4df7ab52805..da6fd63d0085 100644
--- a/x11-libs/libcryptui/metadata.xml
+++ b/x11-libs/libcryptui/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>