mgorny 14/12/01 12:48:42 Modified: eog-plugins-3.12.1-r1.ebuild ChangeLog Log: Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild?r1=1.1&r2=1.2 Index: eog-plugins-3.12.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eog-plugins-3.12.1-r1.ebuild 25 Nov 2014 15:17:25 -0000 1.1 +++ eog-plugins-3.12.1-r1.ebuild 1 Dec 2014 12:48:42 -0000 1.2 @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild,v 1.1 2014/11/25 15:17:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild,v 1.2 2014/12/01 12:48:42 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_2,3_3,3_4} ) +PYTHON_COMPAT=( python{3_3,3_4} ) -inherit gnome2 python-single-r1 +inherit gnome2 python-r1 DESCRIPTION="Eye of GNOME plugins" HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"; @@ -16,12 +16,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+exif +flickr map +picasa +python" -# Let people emerge this by default, bug #472932 -IUSE+=" +python_single_target_python3_3" REQUIRED_USE=" map? ( exif ) - python? ( ${PYTHON_REQUIRED_USE} )" + python? ( ^^ ( $(python_gen_useflags '*') ) )" RDEPEND=" >=dev-libs/glib-2.32:2 @@ -51,7 +49,7 @@ " pkg_setup() { - use python && python-single-r1_pkg_setup + use python && [[ ${MERGE_TYPE} == binary ]] && python_setup } src_configure() { 1.21 media-gfx/eog-plugins/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/ChangeLog?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/ChangeLog?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/eog-plugins/ChangeLog?r1=1.20&r2=1.21 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 25 Nov 2014 15:17:25 -0000 1.20 +++ ChangeLog 1 Dec 2014 12:48:42 -0000 1.21 @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/eog-plugins # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.20 2014/11/25 15:17:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.21 2014/12/01 12:48:42 mgorny Exp $ + + 01 Dec 2014; Michał Górny <[email protected]> eog-plugins-3.12.1-r1.ebuild: + Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. *eog-plugins-3.12.1-r1 (25 Nov 2014)
