diff options
-rw-r--r-- | gnome-extra/gnome-contacts/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.8.1.ebuild | 61 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild | 7 |
3 files changed, 12 insertions, 63 deletions
diff --git a/gnome-extra/gnome-contacts/ChangeLog b/gnome-extra/gnome-contacts/ChangeLog index 1c4872baba29..310dc1b7499f 100644 --- a/gnome-extra/gnome-contacts/ChangeLog +++ b/gnome-extra/gnome-contacts/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-contacts # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.17 2013/05/28 18:55:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.18 2013/05/29 21:26:10 pacho Exp $ + + 29 May 2013; Pacho Ramos <pacho@gentoo.org> -gnome-contacts-3.8.1.ebuild, + gnome-contacts-3.8.2.ebuild: + Regenerate pre-generated sources to prevent bug #471628 by Kobboi, Alexander + Tsoy and Evgeny Bobkin. Drop old. *gnome-contacts-3.8.2 (28 May 2013) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.8.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.8.1.ebuild deleted file mode 100644 index b7493220ef3c..000000000000 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.8.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.1.ebuild,v 1.1 2013/04/19 20:21:38 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.18" - -inherit gnome2 vala - -DESCRIPTION="GNOME contact management application" -HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="v4l" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -VALA_DEPEND="$(vala_depend) - dev-libs/folks[vala] - gnome-base/gnome-desktop[introspection] - gnome-extra/evolution-data-server[vala] - net-libs/telepathy-glib[vala] - x11-libs/libnotify[introspection]" - -# Configure is wrong; it needs cheese-3.5.91, not 3.3.91 -RDEPEND=" - >=dev-libs/folks-0.7.3:=[eds,telepathy] - >=dev-libs/glib-2.31.10:2 - >=dev-libs/libgee-0.10:0.8 - >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] - >=gnome-base/gnome-desktop-3.0:3= - net-libs/gnome-online-accounts - >=net-libs/telepathy-glib-0.17.5 - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/libnotify:= - >=x11-libs/gtk+-3.4:3 - x11-libs/pango - v4l? ( >=media-video/cheese-3.5.91:= ) -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - !v4l? ( ${VALA_DEPEND} )" -# When !v4l, we regenerate the .c sources - -src_prepare() { - # Regenerate the pre-generated C sources - if ! use v4l; then - touch src/*.vala - fi - - gnome2_src_prepare - vala_src_prepare -} - -src_configure() { - gnome2_src_configure $(use_with v4l cheese) -} diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild index 5db43143511a..60b91adca516 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild,v 1.1 2013/05/28 18:55:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild,v 1.2 2013/05/29 21:26:10 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -48,6 +48,11 @@ DEPEND="${RDEPEND} " src_prepare() { + # Regenerate the pre-generated C sources, bug #471628 + if ! use v4l; then + touch src/*.vala + fi + gnome2_src_prepare vala_src_prepare } |