commit: c6d5d8c17a309916f034fae84254d7932e5f7e34
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 15 20:45:55 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 22:00:28 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c6d5d8c1
app-crypt/gcr: 3.10.1 → 3.12.0
Build now uses python based tool.
---
.../gcr/{gcr-9999.ebuild => gcr-3.12.0.ebuild} | 28 +++++++++-------------
app-crypt/gcr/gcr-9999.ebuild | 15 ++++++++----
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/app-crypt/gcr/gcr-9999.ebuild b/app-crypt/gcr/gcr-3.12.0.ebuild
similarity index 76%
copy from app-crypt/gcr/gcr-9999.ebuild
copy to app-crypt/gcr/gcr-3.12.0.ebuild
index 4ddc644..4c6a377 100644
--- a/app-crypt/gcr/gcr-9999.ebuild
+++ b/app-crypt/gcr/gcr-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,11 +6,9 @@ EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.20"
VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
-inherit gnome2 vala virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit gnome2 python-any-r1 vala virtualx
DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
HOMEPAGE="https://developer.gnome.org/gcr/";
@@ -19,18 +17,13 @@ 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
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~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.32:2
- >=dev-libs/libgcrypt-1.2.2:=
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/libgcrypt-1.2.2:0=
>=dev-libs/libtasn1-1:=
>=sys-apps/dbus-1
gtk? ( >=x11-libs/gtk+-3:3 )
@@ -41,7 +34,9 @@ RDEPEND="${COMMON_DEPEND}
"
# gcr was part of gnome-keyring until 3.3
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
dev-libs/gobject-introspection-common
+ dev-libs/libxslt
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
@@ -52,10 +47,9 @@ DEPEND="${COMMON_DEPEND}
# eautoreconf needs:
# dev-libs/gobject-introspection-common
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.9 )"
-fi
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
src_prepare() {
# Disable stupid flag changes
diff --git a/app-crypt/gcr/gcr-9999.ebuild b/app-crypt/gcr/gcr-9999.ebuild
index 4ddc644..da0d1a4 100644
--- a/app-crypt/gcr/gcr-9999.ebuild
+++ b/app-crypt/gcr/gcr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,8 +6,9 @@ EAPI="5"
GCONF_DEBUG="no"
VALA_MIN_API_VERSION="0.20"
VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
-inherit gnome2 vala virtualx
+inherit gnome2 python-any-r1 vala virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -29,8 +30,8 @@ fi
COMMON_DEPEND="
>=app-crypt/gnupg-2
>=app-crypt/p11-kit-0.19
- >=dev-libs/glib-2.32:2
- >=dev-libs/libgcrypt-1.2.2:=
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/libgcrypt-1.2.2:0=
>=dev-libs/libtasn1-1:=
>=sys-apps/dbus-1
gtk? ( >=x11-libs/gtk+-3:3 )
@@ -41,7 +42,9 @@ RDEPEND="${COMMON_DEPEND}
"
# gcr was part of gnome-keyring until 3.3
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
dev-libs/gobject-introspection-common
+ dev-libs/libxslt
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
@@ -57,6 +60,10 @@ if [[ ${PV} = 9999 ]]; then
doc? ( >=dev-util/gtk-doc-1.9 )"
fi
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
# Disable stupid flag changes
sed -e 's/CFLAGS="$CFLAGS -g"//' \
