diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-16 17:42:41 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-16 17:42:41 +0000 |
| commit | 0f6d9f1d0845b4ba5a5bf08d1511e888ca606133 (patch) | |
| tree | 6797740567f2ca9d7cb52220ee585b2f74eab7fb /app-crypt/gcr | |
| parent | sparc stable wrt #435650 (diff) | |
| download | gentoo-2-0f6d9f1d0845b4ba5a5bf08d1511e888ca606133.tar.gz gentoo-2-0f6d9f1d0845b4ba5a5bf08d1511e888ca606133.tar.bz2 gentoo-2-0f6d9f1d0845b4ba5a5bf08d1511e888ca606133.zip | |
Restore clean EAPI5 ebuild.
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'app-crypt/gcr')
| -rw-r--r-- | app-crypt/gcr/ChangeLog | 5 | ||||
| -rw-r--r-- | app-crypt/gcr/gcr-3.6.2.ebuild | 27 |
2 files changed, 12 insertions, 20 deletions
diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog index 934e16e2207c..08156c11d8d3 100644 --- a/app-crypt/gcr/ChangeLog +++ b/app-crypt/gcr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/gcr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.11 2012/12/16 14:23:23 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.12 2012/12/16 17:42:41 tetromino Exp $ + + 16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gcr-3.6.2.ebuild: + Restore clean EAPI5 ebuild. 16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> gcr-3.6.2.ebuild: Version bump for Gnome 3.6. diff --git a/app-crypt/gcr/gcr-3.6.2.ebuild b/app-crypt/gcr/gcr-3.6.2.ebuild index ab5582dfe169..7249d3deb5db 100644 --- a/app-crypt/gcr/gcr-3.6.2.ebuild +++ b/app-crypt/gcr/gcr-3.6.2.ebuild @@ -1,35 +1,27 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.6.2.ebuild,v 1.3 2012/12/16 14:23:23 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.6.2.ebuild,v 1.4 2012/12/16 17:42:41 tetromino Exp $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" inherit gnome2 virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules" HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2+ LGPL-2+" -SLOT="0" +SLOT="0/1" # subslot = suffix of libgcr-3 IUSE="debug +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 ~x86-linux ~sparc-solaris ~x86-solaris" COMMON_DEPEND=" >=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.6 >=dev-libs/glib-2.32:2 - >=dev-libs/libgcrypt-1.2.2 - >=dev-libs/libtasn1-1 + >=dev-libs/libgcrypt-1.2.2:= + >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1.0 >=x11-libs/gtk+-3.0:3 introspection? ( >=dev-libs/gobject-introspection-1.29 ) @@ -39,6 +31,7 @@ RDEPEND="${COMMON_DEPEND} " # gcr was part of gnome-keyring until 3.3 DEPEND="${COMMON_DEPEND} + dev-libs/gobject-introspection-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 @@ -57,14 +50,10 @@ src_prepare() { DOCS="AUTHORS ChangeLog HACKING NEWS README" G2CONF="${G2CONF} $(use_enable introspection) - --enable-debug=default + $(usex debug --enable-debug=yes --enable-debug=default) --disable-update-icon-cache --disable-update-mime" - if use debug; then - G2CONF="${G2CONF} --enable-debug=yes" - fi - # Disable stupid flag changes sed -e 's/CFLAGS="$CFLAGS -g"//' \ -e 's/CFLAGS="$CFLAGS -O0"//' \ |