commit: 275e54d972f97f5e291c35d84a40412cfd38de9e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 06:48:31 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 06:48:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=275e54d9
app-crypt/gcr: sync with gentoo repository
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
app-crypt/gcr/gcr-3.20.0.ebuild | 80 -----------------------------------------
app-crypt/gcr/gcr-9999.ebuild | 13 +++----
2 files changed, 5 insertions(+), 88 deletions(-)
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
deleted file mode 100644
index 702f8201..00000000
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/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 ~arm64 ~hppa ~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.38:2
- >=dev-libs/libgcrypt-1.2.2:0=
- >=dev-libs/libtasn1-1:=
- >=sys-apps/dbus-1
- gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
- 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-libs/vala-common
- 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
-# dev-libs/vala-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-9999.ebuild b/app-crypt/gcr/gcr-9999.ebuild
index 8e9608f5..3f88de6e 100644
--- a/app-crypt/gcr/gcr-9999.ebuild
+++ b/app-crypt/gcr/gcr-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 )
inherit gnome2 python-any-r1 vala virtualx
if [[ ${PV} = 9999 ]]; then
@@ -17,6 +15,7 @@ HOMEPAGE="https://git.gnome.org/browse/gcr";
LICENSE="GPL-2+ LGPL-2+"
SLOT="0/1" # subslot = suffix of libgcr-3
+
IUSE="debug gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
if [[ ${PV} = 9999 ]]; then
@@ -27,7 +26,6 @@ else
fi
COMMON_DEPEND="
- >=app-crypt/gnupg-2
>=app-crypt/p11-kit-0.19
>=dev-libs/glib-2.38:2
>=dev-libs/libgcrypt-1.2.2:0=
@@ -86,6 +84,5 @@ src_configure() {
}
src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check
+ virtx emake check
}
