x11-libs/libcryptui: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

3 files changed, 13 insertions, 98 deletions

diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
deleted file mode 100644
index 118a29e1..00000000
--- a/x11-libs/libcryptui/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST libcryptui-3.6.0.tar.xz 1201296 SHA256 0a4a747fff33acd03d1381d27454f8aa5eaca026b7475e24c4b8f8272bbe1c87 SHA512 276eb36f4a145cb0151a5d3cbc4fce09faa8eb9159e6c8ee18eabacf475e43d8f1e28549f0acbc221aa75eb070f3c7a64c2d870eb6be0e0e7fb8beb4f5ad6b35 WHIRLPOOL 1c0de3ec8656afea138fd7b19392bc4eb6b3975b94bb3cc721da1706de4ae4fec7fea28d985e9c8acbace910a17f3519b33680909b97dde32c368bf1cebc1603
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCNp9IACgkQ1fmVwcYIWAaInQCfajcxE1WCE9rHgV8Rc3XqOold
-pakAn30nPjb2v4yf+bW6JDmvpbIiKzfB
-=raSo
------END PGP SIGNATURE-----
diff --git a/x11-libs/libcryptui/libcryptui-3.6.0.ebuild b/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
deleted file mode 100644
index 7d2edd3b..00000000
--- a/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="User interface components for OpenPGP"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+introspection libnotify test"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
-
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
-COMMON_DEPEND="
-	>=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
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.3
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-# Before 3.1.4, libcryptui was part of seahorse
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-3.1.4
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.9 )"
-fi
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-update-mime-database
-		$(use_enable introspection)
-		$(use_enable libnotify)
-		$(use_enable test tests)"
-
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
-		-i configure.ac configure || die "sed failed"
-
-	gnome2_src_prepare
-}
diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-9999.ebuild
index 7d2edd3b..0a9f3288 100644
--- a/x11-libs/libcryptui/libcryptui-9999.ebuild
+++ b/x11-libs/libcryptui/libcryptui-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -14,7 +14,7 @@ fi
 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="+introspection libnotify test"
 if [[ ${PV} = 9999 ]]; then
@@ -42,10 +42,10 @@ COMMON_DEPEND="
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 "
 DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
 	>=app-text/scrollkeeper-0.3
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 # Before 3.1.4, libcryptui was part of seahorse
@@ -59,14 +59,6 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-update-mime-database
-		$(use_enable introspection)
-		$(use_enable libnotify)
-		$(use_enable test tests)"
-
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
@@ -74,3 +66,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
+}