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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 41 insertions, 41 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/Manifest b/x11-libs/libcryptui/Manifest
index cab87d03e55b..c891867304f3 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST libcryptui-3.2.2.tar.xz 1196232 RMD160 a84f4b43844cb238b48772da4c3f5ecfc6cf614b SHA1 23bbb4915012ba6cc3eff72b2d91f0725f82a848 SHA256 76123c9d3ccdefc94f55b1726f1084a48a1a8c792ee641a39d415142fe4ac4eb
-DIST libcryptui-3.4.1.tar.xz 1199564 RMD160 6373d9b54f0466a7ee6fd00ee3cd4e64b7db9171 SHA1 686ef0a103536e70019c43ad41a57f7fc2fe58d1 SHA256 fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5
-EBUILD libcryptui-3.2.2.ebuild 1603 RMD160 38be7a88ae48bf1e1d7110288de3c182757ff9ad SHA1 3cc88786b9f60a80846a8fe3911e51422750a1ba SHA256 cfbc6a63794cc4b542fb98f79353075f0fda1add564690c6929eb404f8d822d0
-EBUILD libcryptui-3.4.1.ebuild 1639 RMD160 d24b1c1589dc4106cce3ff627700b1c5004b40d5 SHA1 8cce25a479bf1d10e17c76914e84b04aa0461785 SHA256 c549bbc8606e8f951a240678ac81e682c107b4083f816efaade8e99781521d01
-MISC ChangeLog 1118 RMD160 e51177df755edc3af15b87c8fa2b5c04349a5aed SHA1 2f242405490ac3997d295f63e1b3e4b52a686cad SHA256 5dc5ab2556202c2267e464420ec420836f5be92fe3863c35265871a809e3b30e
-MISC metadata.xml 275 RMD160 d198c939ae6264af123154814d7862c93e21f4de SHA1 3a1da363677fe7793a7d6b99de721b87283d174a SHA256 b686b26b3537ca6aabcea923eeb34db08cae5f75a0f2559e381c88e02e6fab5f
+DIST libcryptui-3.4.1.tar.xz 1199564 SHA256 fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5 SHA512 7a9c31f10bc9077ecf216984ef61dae38c2a50c72cc592a395c85911e86b595991c7a907e3db60fe73a5c35966399c57439c020e645a11940e343bc6f3dec368 WHIRLPOOL 98af2c727bb045dc59af1b16c9bfd532e9abf19d1b14b3398b6274fec37e156748ad57d45f4947273a67ca7a3bec3c44535e737d022c6d230de0513d63d1baac
+DIST libcryptui-3.6.0.tar.xz 1201296 SHA256 0a4a747fff33acd03d1381d27454f8aa5eaca026b7475e24c4b8f8272bbe1c87 SHA512 276eb36f4a145cb0151a5d3cbc4fce09faa8eb9159e6c8ee18eabacf475e43d8f1e28549f0acbc221aa75eb070f3c7a64c2d870eb6be0e0e7fb8beb4f5ad6b35 WHIRLPOOL 1c0de3ec8656afea138fd7b19392bc4eb6b3975b94bb3cc721da1706de4ae4fec7fea28d985e9c8acbace910a17f3519b33680909b97dde32c368bf1cebc1603
+EBUILD libcryptui-3.4.1.ebuild 1645 SHA256 3abd7669ed111e874c4a50abeca4bf0d8596efafc54234553325483f42b47683 SHA512 ff7c6e0e50dd5c3e9959794bbcc8fb2de57781f27082654ce979ce858b9b38ac68fcd57ee42fd39626210ee34639484ae0f0434e6418fceb253912f76c575c91 WHIRLPOOL 9120593d53bac0ce2e9a5877317798ffad92edeffcbaa56b249295f9a02cfd3669407e23722aae2927d587d012755ce77a1c0cea74d10fce9015945475a5abe6
+EBUILD libcryptui-3.6.0.ebuild 1590 SHA256 582b87c92899f20d4c61aaf199a4d101196b13655ba3cefe32d0c15263529847 SHA512 62e98bd950c9f53e01bd4a4a19214a9c527435fa069b46ee7dfdd9f2d542d8e7db0ad72902ad39ec54a6f0dcc820c58ed27338beb83a0f4b2ff5901b6dba9270 WHIRLPOOL a8c58fab4e2f8d0a6c86de9324bbf306a886f63c176dd43eb38ab24ff3041b967accf0b5e30fdb7d466e3a6158ffd26379b41083a4630034869d0c8ae8905619
+MISC ChangeLog 1411 SHA256 721721046362414ce4116b61830339000bc7d4bae0fb33dd5206d142f7c18f98 SHA512 e626e5454ef2002470959b316dbeabf2c9ddae8b437eda536d13d03c7bd96fff139a2f6adc8bcf292f8e7e2c5781ccc40d0b8101f761c49f039c22701169c942 WHIRLPOOL faed0c888138e2793a332be0375b7cffc3c0aeacb4382cffda7f38968c45627d54faa650e07a7f9354f3c36da8b6bf4c0d5f43dfe4f59427e3fd50fdfcda4550
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPr/rhAAoJEJ0WA1zPCt1hOJQH/26wgZ01fU8RrExvIexM7EX4
-szIbMJrOEIJhxtTk79f/SfJPwkn1OaLXKGcFxGoH+HB2VTlodZDw60iDW/VVs8Dp
-SM8omrPRJBqePCbAhPj8yfMlNOKWXqUqdsxAlnCDHY/viBwKlWBiLYIq/TtdcPLv
-oxw/V0q/ASQu3ufJy2mHcry0DSaeDNf87O5FRp+EIYnWOj6653y3RkeAGW5dhU3j
-O0wFtk6A5H+feGEZckXTES28AkP53G2jG/18FL+wbDQra6Ztk/7rikaR621nO0tA
-2TJIlt2gOjLhBUBdewfL2+2sqhKq97v4G1yczo+6XA4uMvuy3b6MJ6Lap0jCPFY=
-=9cZx
+iEYEAREIAAYFAlDXPz0ACgkQ1fmVwcYIWAYW3ACgsXD5IgR8O7Sf0RPy4XnwjQwb
+N68AoLTnn+2iGWGYg9aqYDkrikCcJjg3
+=eJgV
 -----END PGP SIGNATURE-----
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>