diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-13 20:23:49 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-13 20:23:49 +0000 |
| commit | 6253953b22eb230f40b95169301f05bb085a6f1d (patch) | |
| tree | 95ab9011e908e695338a25c3a436b4bbbecb28d6 /gnome-base/libgnome-keyring | |
| parent | Split out CD-ROM functions from eutils.eclass. (diff) | |
| download | gentoo-2-6253953b22eb230f40b95169301f05bb085a6f1d.tar.gz gentoo-2-6253953b22eb230f40b95169301f05bb085a6f1d.tar.bz2 gentoo-2-6253953b22eb230f40b95169301f05bb085a6f1d.zip | |
Drop unneeded gconf dependency (bug #398751, thanks to Olof Kindgren for reporting). Drop old.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/libgnome-keyring')
4 files changed, 12 insertions, 59 deletions
diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog index b7a87dcac6a9..784bfba1232e 100644 --- a/gnome-base/libgnome-keyring/ChangeLog +++ b/gnome-base/libgnome-keyring/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/libgnome-keyring -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.30 2011/11/17 06:10:33 tetromino Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.31 2012/01/13 20:23:49 tetromino Exp $ + + 13 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + libgnome-keyring-2.32.0.ebuild, -libgnome-keyring-3.2.0.ebuild, + libgnome-keyring-3.2.2.ebuild: + Drop unneeded gconf dependency (bug #398751, thanks to Olof Kindgren for + reporting). Drop old. *libgnome-keyring-3.2.2 (17 Nov 2011) diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild index 1aab4f2edbf6..446575a8d0bc 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.13 2011/09/12 08:41:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.14 2012/01/13 20:23:49 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -17,7 +17,6 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-lin IUSE="debug doc test" RDEPEND=">=sys-apps/dbus-1.0 - gnome-base/gconf >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29" DEPEND="${RDEPEND} diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild deleted file mode 100644 index a79a43237e3f..000000000000 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild,v 1.1 2011/10/30 07:28:17 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Compatibility library for accessing secrets" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="debug doc test" - -RDEPEND=">=sys-apps/dbus-1.0 - gnome-base/gconf - >=gnome-base/gnome-keyring-3.1.92[test?]" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable test tests full)" - DOCS="AUTHORS ChangeLog NEWS README" -} - -src_prepare() { - gnome2_src_prepare - - # FIXME: Remove silly CFLAGS - sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \ - -e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \ - -i configure.ac configure || die "sed failed" - - # FIXME: Remove DISABLE_DEPRECATED flags - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \ - -i configure.ac configure || die "sed 2 failed" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "tests failed" -} diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild index bae7185e2d85..f814c0a256a2 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:10:33 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.2 2012/01/13 20:23:49 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris IUSE="debug doc test" RDEPEND=">=sys-apps/dbus-1.0 - gnome-base/gconf >=gnome-base/gnome-keyring-3.1.92[test?]" DEPEND="${RDEPEND} sys-devel/gettext |